Merge branch 'maint' into branch-1.11