Sync with maint
authorJunio C Hamano <redacted>
Wed, 6 Dec 2017 17:27:59 +0000 (09:27 -0800)
committerJunio C Hamano <redacted>
Wed, 6 Dec 2017 17:27:59 +0000 (09:27 -0800)

Trivial merge
git clone https://git.99rst.org/PROJECT