Upstream: Update to git-1.8.5.4.