Merge branch 'jc/color-diff-doc' into maint-1.8.1