Merged revisions 79470 via svnmerge from