Merge branch 'master' into 'master'

fixed error in mail_backup -> all mail-backups would have been deleted with old …

…code because of * in filename

See merge request !247