Merged revisions 297952 via svnmerge from