Merge "Add support for CMYK jpeg images." into jb-mr2-dev