Merged revisions 88539 via svnmerge from