Merged revisions 89079 via svnmerge from