Merge branch 'jc/magic-pathspec'