Merge branch 'jk/pathspec-magic-disambiguation'