Merge from trunk revision 89be17a1b231ade643f28fbe616d53377e069da8.