Merged revision 7510 via svnmerge from