Merge from trunk revision 5eb9f117a361538834b9740d59219911680717d1.