Merged revisions 80390 via svnmerge from