Sync with master
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2018 23:12:05 +0000 (15:12 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2018 23:12:05 +0000 (15:12 -0800)
* master:
Seventh batch for 2.17

Trivial merge