Merge branch 'js/git-path-in-subdir'