Merge branch 'maint-2.11' into maint