Sync with v2.13.4
authorJunio C Hamano <gitster@pobox.com>
Tue, 1 Aug 2017 18:46:51 +0000 (11:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Aug 2017 18:46:59 +0000 (11:46 -0700)
Trivial merge