Merged revisions 89288 via svnmerge from