Merged revisions 78569 via svnmerge from