Merge branch 'jk/add-i-use-pathspecs'