Sync with maint
authorJunio C Hamano <redacted>
Tue, 21 Mar 2017 22:11:38 +0000 (15:11 -0700)
committerJunio C Hamano <redacted>
Tue, 21 Mar 2017 22:11:38 +0000 (15:11 -0700)

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