Merge "Enable color output from gcc and clang"