Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/sites/database_quota_stats.php

@@ -80,7 +80,8 @@
         $client = $app->db->queryOneRecord("SELECT * FROM client WHERE client_id = ?", $sys_group['client_id']);
         $rec['client'] = $client['username'];
         $rec['used'] = 'n/a';
         $rec['quota'] = 'n/a';
         if (empty($rec['database_quota'])) $rec['database_quota'] = 0;
         $rec['quota'] = $rec['database_quota'];
      }
      $rec['id'] = $rec[$this->idx_key];