21cb435ed5eb250a7f94887ddd75f6b367ea231f from master; better colour conversion selection.