Code

Merge branch 'nd/pathspec-recursion-cleanup'