Merged revisions 69794 via svnmerge from