Merge branch 'maint-2.10' into maint-2.11