Merging changes to image.php. Not sure why or how these got out of sync, but this should resolve it.
Merging changes to image.php. Not sure why or how these got out of sync, but this should resolve it.

chrismeller/chris-mkii,chrismeller/chris-mkii