Fix a typo
Merge branch 'color' into combined