Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2016 21:53:45 +0000 (14:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2016 21:53:45 +0000 (14:53 -0700)
* maint:
Almost ready for 2.8.3

Trivial merge