Merge branch 't/diffall/jsdiff' into refs/top-bases/next