Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-04-22 4ae3b94bce6b2f26002c1a50247a01ab4cf2219a

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

      }