Merge branch 'jc/magic-pathspec' into next