Sync with master
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Feb 2018 00:43:09 +0000 (16:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Feb 2018 00:43:09 +0000 (16:43 -0800)
* master:
Second batch for 2.17

Trivial merge