Another round of image crunching
Merge pull request #2177 from darkwing/image-crunch-3

Another round of image crunching