Merged revisions 94797 via svnmerge from