Merge branch 'maint-2.10' into maint-2.11

Junio C Hamano committed May 5, 2017 at 13:26 UTC a849d36cf2877a1890371851710382f463290978

No changes.