Merged revisions 89586 via svnmerge from