Merge branch 'maint-1.7.11' into maint