Removed colons from backup_dir as it makes OS X Finder go mad.
Merge commit '6b6f8bce5950a8756e121f8b12e024b41ce9e2ed'