Sync with master
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Feb 2018 23:26:42 +0000 (15:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Feb 2018 23:26:42 +0000 (15:26 -0800)
* master:
Git 2.16.2
Third batch for 2.17

Trivial merge