merge trunk change into 0.10 branch (f0f4dda12b1db76e49ef76dfc048fb459e82f6f9...4e49f8ab04517aed9de42a65988236b2d83ab2b6)