Merge "Remember to skip the no-backup dir during recursions"