Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-04-12 ae3e7aade5800213dd5c0a75f69344ce2097f35d

 interface/lib/classes/ini_parser.inc.php

@@ -59,8 +59,8 @@
         $content .= "[$section]\n";
         foreach($data as $item => $value) {
            if($item != ''){
               $value    = trim($value);
               $item    = trim($item);
               $value  = trim($value);
               $item  = trim($item);
               $content .= "$item=$value\n";
            }
         }