Fix absence of images when compiled with RUN_IN_PLACE=0.
Merge remote-tracking branch 'upstream/master' into step