Merge from trunk revision 09e18d113b3c3dae896ac1a8ad1e0087adbb153b.