Merged revisions 257467 via svnmerge from