Merge changes from git-scm.org (v2.1.2)

Merge changes from the mainline git repository (git-scm.org, github/git, github/gitster) at tag 'v2.1.2'.