Upgrade fix for git-1.8