Merge branch 'jk/trailing-slash-in-pathspec'