Merged revisions

Merged ColorToStringConverter.cs