Merged revisions 79393 via svnmerge from