Allow colors to be toggled on/off in Color Picker - U4-4935
Merge branch '7.1.4' into colorpicker-toggle
Merge pull request #383 from imulus/colorpicker-toggle

Allow colors to be toggled on/off in Color Picker - U4-4935