Merged revisions 69689 via svnmerge from