Merge branch 'js/diff-color-words'