Merged revisions 257070 via svnmerge from