Merged revisions 80562 via svnmerge from