Fixed a problem in the color class.
Merge remote-tracking branch 'origin/develop' into develop