Merge branch 'nd/ls-tree-pathspec'