Merged revisions 87571 via svnmerge from