Merge branch 'nd/magic-pathspec-from-root'