Merged revisions 69744 via svnmerge from