Merged revisions 7740 via svnmerge from