Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 May 2016 22:50:34 +0000 (15:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 May 2016 22:50:34 +0000 (15:50 -0700)
* maint:
Start preparing for 2.8.3

Trivial merge