fix issue with 0 sized generated images conflicting with 1 sized images
Merge branch 'master' into production