Merge branch 'jk/git-path'