Merge branch 'master' into dev
switch to nice built-in colors
Merge remote-tracking branch 'upstream/dev'