Fix problem with backup-name backups
Merge branch 'master' into fusionbox