Merged revisions 89493 via svnmerge from