Merge branch 'cw/diff-highlight'