Merge branch 'jk/color-diff-plain-is-context'