Merged revisions 89839 via svnmerge from