Merged revisions 69071 via svnmerge from