Merge with Trunk Revision 11109
Fixed some merge conflicts.