Merge branch 'stable-3.1' into 'stable-3.1'

Till Brehm

2016-05-19 9d3f20bb3ef7391c94eae54ddf3750bcc181678e

 interface/web/tools/interface_settings.php

@@ -126,7 +126,7 @@
         print '<script type="text/javascript">document.location.reload();</script>';
         exit;
      }
      else parent::onShow();
      //else parent::onShow();
   }