Merge branch 'js/vimdiff-quotepath-fix' into maint