Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Dec 2017 17:27:59 +0000 (09:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Dec 2017 17:27:59 +0000 (09:27 -0800)

Trivial merge