Sync with maint
authorJunio C Hamano <redacted>
Tue, 13 Jun 2017 20:52:53 +0000 (13:52 -0700)
committerJunio C Hamano <redacted>
Tue, 13 Jun 2017 20:52:53 +0000 (13:52 -0700)

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