simplified image_trafos
Merge branch 'master' into s3_auth