Merged revisions 80818 via svnmerge from