Merged revisions 69358 via svnmerge from