Merge branch 'jt/diff-color-move-fix'