Merge 1.9-maint into 2.0-maint