Merge branch 'maint-2.5' into maint-2.6