Merge branch 'mh/diff-stat-color'