Merge branch 'master' into 'master'

Till Brehm

2015-09-24 cedad166fa7655b0a49e7e27c57bbee78032fbe7

 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();
   }