Merged revisions 79436 via svnmerge from