Merged revisions 81418 via svnmerge from