am 933e7c37: am 37c8f8b5: am 20f07e33: Merge "Unlink an old file before moving the new file over it" into jb-mr1-dev * commit '933e7c37': Unlink an old file before moving the new file over it