Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-10 447c8380668b753c95f97ec2b87ff322e4aff002

 server/lib/classes/db_mysql.inc.php

@@ -558,7 +558,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_DEBUG);
         $app->log('Unable to connect to the database'.mysqli_connect_error(), LOGLEVEL_DEBUG);
         return;
      }
      /* Get database-size from information_schema */