Merge branch 'maint-2.9' into maint-2.10

Junio C Hamano committed May 5, 2017 at 13:21 UTC fc92b0878ccaa128e7c4505788f7c477284f0021

No changes.