Code

Merge branch 'mh/show-branch-color' into sb/show-branch-parse-options