Merged revisions 69668 via svnmerge from