Merged revisions 79665 via svnmerge from