Merge branch 'js/realpath-pathdup-fix' into maint