Merged revisions 89286 via svnmerge from