Merge from trunk revision 24ca97325cab7bc454c785d55f37120fe7ea6f74.