Sync with master
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Sep 2017 04:40:33 +0000 (13:40 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Sep 2017 04:40:33 +0000 (13:40 +0900)
* master:

Trivial merge