Merged revisions 89886 via svnmerge from