Merge branch 'sb/pathspec-errors'