Merge branch 'maint-2.4' into maint-2.5

Junio C Hamano committed May 5, 2017 at 12:46 UTC 531788af951cbaf5356363f66c54594b555bdde3

No changes.