Merge 1.9-maint (16b3ad0) into 2.0-maint