Merge branch 'maint-1.8.5' into maint-1.9