Merged revisions 81074 via svnmerge from