Merge branch 'bw/pathspec-cleanup'