Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 29 Sep 2016 23:58:29 +0000 (16:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 29 Sep 2016 23:58:29 +0000 (16:58 -0700)
* maint:
Prepare for 2.10.1

Trivial merge