Merge branch 'dk/zsh-git-repo-path-fix'