Merged revisions 7468 via svnmerge from