Merge branch 'js/diff-highlight-avoid-sigpipe'