Sync with 2.8.3
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 May 2016 22:33:57 +0000 (15:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 May 2016 22:33:57 +0000 (15:33 -0700)
* maint:
Git 2.8.3

Trivial merge