Merged revisions 69847 via svnmerge from