Merged revisions 79523 via svnmerge from