Merge "Fix gcc color diagnostics"