Merged revisions 81369 via svnmerge from