Merged revisions 89119 via svnmerge from