Merge 1.9-maint (f26fcad) into 2.0-maint