Merged revisions 80362 via svnmerge from