Merged revisions 88862 via svnmerge from