Merged revisions 87906 via svnmerge from