Sync with maint
authorJunio C Hamano <redacted>
Sun, 4 Jun 2017 01:29:26 +0000 (10:29 +0900)
committerJunio C Hamano <redacted>
Sun, 4 Jun 2017 01:29:26 +0000 (10:29 +0900)

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