Merge branch 'mh/show-branch-color'