Merge "Color management, the missing pieces" into oc-dev