Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Sep 2016 20:55:18 +0000 (13:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Sep 2016 20:55:18 +0000 (13:55 -0700)
* maint:
Start preparing for 2.10.1

Trivial merge