Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-15 d302d8e556da5b1dcd9ce4f9ec086a0e4aa52dd6

 server/plugins-available/software_update_plugin.inc.php

@@ -248,7 +248,7 @@
         //* Connect to the database
         $link = mysqli_connect($clientdb_host, $clientdb_user, $clientdb_password);
         if (!$link) {
            $app->log('Unable to connect to the database'.mysqli_error($link), LOGLEVEL_ERROR);
            $app->log('Unable to connect to the database'.mysqli_connect_error(), LOGLEVEL_ERROR);
            return;
         }