Sync with master
authorJunio C Hamano <gitster@pobox.com>
Thu, 8 Mar 2018 21:34:50 +0000 (13:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 Mar 2018 21:34:50 +0000 (13:34 -0800)
* master:
Eighth batch for 2.17

Trivial merge