Merged revisions 87686 via svnmerge from