Ported revisions 37a051dcc756c730295580cd1013e1469f22020d through dc3fd6912e0378a91d72c748e0037d1d4b018909 to the 1.10 branch.