Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Oct 2016 21:55:48 +0000 (14:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Oct 2016 21:55:48 +0000 (14:55 -0700)
* maint:
Start preparing for 2.10.2

Trivial merge