Add custom color comment
Merge pull request #1378 from matheod/customColorComment

Add custom color comment
Merge upstream into fixMigrate ಠ_ಠ