Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-05-24 a775b024c9929f720771830c15e8b77303595cc0

 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!