Merge branch 'bw/attr-pathspec'