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