Merged revisions 79957 via svnmerge from