Merge pull request #2054 from anta999/colortest