Merge branch 'ignore-backup-folder'