Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-26 6028e4692d172b63f8af79c4460f9dbff5a9a01c

 interface/lib/classes/remote.d/mail.inc.php

@@ -357,7 +357,7 @@
         return false;
      }
   
      if (/*$action_type != 'backup_download_mail' and*/ $action_type != 'backup_restore_mail') {
      if (/*$action_type != 'backup_download_mail' and*/ $action_type != 'backup_restore_mail' and $action_type != 'backup_delete_mail') {
         $this->server->fault('invalid_action', "Invalid action_type $action_type");
         return false;
      }