Merge branch 'js/difftool-builtin'