Merged with Trunk Revision 10109.