Merge branch 'nd/magic-pathspec' into maint