Merge branch 'maint-2.5' into maint-2.6

Junio C Hamano committed May 5, 2017 at 12:52 UTC ab37a18b60b4f061de8239256589faeaab630ff8

No changes.