Sync with Git 2.17-rc2
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Mar 2018 19:18:46 +0000 (12:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Mar 2018 19:18:46 +0000 (12:18 -0700)
* master:
Git 2.17-rc2

Trivial merge