Image Optimization
Merge pull request #2138 from robertmuehsig/1887-imageoptimization

Image Optimization for #1887