Merged revisions 81886 via svnmerge from