Merge branch 'stable-3.1'

Marius Burkard

2016-01-29 613433fd4eed8f566e9f8f0be4b6116fe028f123

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