Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Nov 2017 05:11:40 +0000 (14:11 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Nov 2017 05:11:40 +0000 (14:11 +0900)
* maint:
Almost ready for 2.15.1

Trivial merge