Make sure that the images aren't CMYK. [Fixes #3104]
Merge git://github.com/spree/spree