Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-31 dbf57dddf7ef07a0168ad0c1d64de0735a9c5804

 server/plugins-available/software_update_plugin.inc.php

@@ -267,7 +267,6 @@
            $app->log('Unable to create database user'.$db_config['database_user'].' '.mysqli_error($link), LOGLEVEL_ERROR);
         }

         mysqli_query($link, "FLUSH PRIVILEGES;");
         mysqli_close($link);

      }