Upstream git 2.1.2
Merge pull request #48 from boxen/git-2.1.2

Upstream git 2.1.2