Merge pull request #1689 from tomykaira/modularize_NullColorizer

Modularize NullColorizer
cleanup and changelog for 1689

Conflicts:
	Changelog.md