Sync with Git 2.17-rc0
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Mar 2018 22:11:20 +0000 (15:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Mar 2018 22:11:20 +0000 (15:11 -0700)
Trivial merge