ensure prepare_image is called [FATE#316328]
Merge pull request #14 from fcrozat/master

 ensure prepare_image is called [FATE#316328]