Sync with master
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Mar 2018 21:38:28 +0000 (14:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Mar 2018 21:38:28 +0000 (14:38 -0700)
* master:
Git 2.16.3

Trivial merge