Merge changes from posh-git