Merge branch 'jk/war-on-git-path'