#497948 by roychri and Rob Loach: Fixed terribly broken Color module (with tests so we don't do it again ;)).