Merged revisions 89248 via svnmerge from