Merge from trunk revision 3a39a31b8ae9c6465434aefa657f7fcc86f905c0.