Sync with 2.19.2
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 14:23:48 +0000 (23:23 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 14:23:48 +0000 (23:23 +0900)
Trivial merge