Merged revisions 81379 via svnmerge from