Sync with master
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Feb 2018 00:17:30 +0000 (16:17 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Feb 2018 00:17:30 +0000 (16:17 -0800)
* master:
Fifth batch for 2.17

Trivial merge