Merged revisions 94077 via svnmerge from