Merge branch 'jc/color-diff-doc'