If we successfully save a file but fail to move it to its proper location,
then, if we made a backup and the original file was not a symlink, we moved
that file, so it will look to the user as if it was deleted. This is bug
Merge remote-tracking branch 'github/build-bot-master' into bleeding-edge-master
2014.10.27-16.00