Merge branch 'mh/maint-commit-color-status' into maint