Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Feb 2018 18:53:19 +0000 (10:53 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Feb 2018 18:53:28 +0000 (10:53 -0800)

Trivial merge