Merged revisions 80304 via svnmerge from