Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-09 9e63ffc814b8087ea8c1ba7c819bc91ff9ee985a

 interface/web/sites/database_edit.php

@@ -262,7 +262,6 @@
               }
               unset($tmp);
            }

         }
      } else {
         // check if client of database parent domain is client of db user!