Merge commit '79fdbfdb'

This commit is purposely skipped because it doesn't work very well
with what our img2enc.c supports.

* commit '79fdbfdb':
  img2enc: Refactor the atomic renaming code
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>