Merged revisions 7340 via svnmerge from