Merge branch 'maint-1.9' into maint-2.0