stripped out colors that break some terminal sessions
Merge remote-tracking branch 'origin/master'