Merge branch 'ps/stash-push-pathspec-fix'