am f178d364: Merge "Allow images to be readded to target-files" into lmp-dev

* commit 'f178d36441c3a688cfe5eb41a5ce724ba01a4ecf':
  Allow images to be readded to target-files