Image optimization.
Merge pull request #8299 from jamiestevens/image-opt

Image optimization.