Sync with 2.12.5
authorJunio C Hamano <redacted>
Fri, 22 Sep 2017 05:48:08 +0000 (14:48 +0900)
committerJunio C Hamano <redacted>
Fri, 22 Sep 2017 05:48:08 +0000 (14:48 +0900)
Signed-off-by: Junio C Hamano <redacted>

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