Merge "add a global --color option"