Merged revisions 80047 via svnmerge from