Merged revisions 94824 via svnmerge from