Merged revisions 80302 via svnmerge from