Sync with 2.8.4
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Jun 2016 21:30:49 +0000 (14:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Jun 2016 21:30:49 +0000 (14:30 -0700)
* maint:
Git 2.8.4

Trivial merge