Merge with Trunk Revision 10506.
Conflicts resolved.