Sync with v2.15.1
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Nov 2017 04:43:55 +0000 (13:43 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Nov 2017 04:44:21 +0000 (13:44 +0900)
Trivial merge