Merge "Fix color matrix bug."