Merged revisions 88768 via svnmerge from