Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Nov 2017 03:17:43 +0000 (12:17 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Nov 2017 03:17:43 +0000 (12:17 +0900)

Trivial merge