Merged revisions 257342 via svnmerge from