Incorporate changes from posh-git so the two play nice together