Allow commands to output color
Guard against shipping with no changes
Merge branch 'master' into cr-hackManPage