Support images without large or huge sizes.
Merge branch 'master' into module