Merged revisions 88624 via svnmerge from