Merge branch 'js/gitdir-at-unc-root'