Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-06-16 e674659333619b155abf9e946a56e48d42861c22

 server/lib/classes/cron.d/500-backup_mail.inc.php

@@ -176,7 +176,7 @@
                  $dir_handle = dir($mail_backup_dir);
                  $files = array();
                  while (false !== ($entry = $dir_handle->read())) {
                     if($entry != '.' && $entry != '..' && substr($entry,0,4+strlen($rec['mailuser_id'])) == 'mail'.$rec['mailuser_id'] && is_file($mail_backup_dir.'/'.$entry)) {
                     if($entry != '.' && $entry != '..' && substr($entry,0,5+strlen($rec['mailuser_id'])) == 'mail'.$rec['mailuser_id'].'_' && is_file($mail_backup_dir.'/'.$entry)) {
                        $files[] = $entry;
                     }
                  }