Merged revisions 258775 via svnmerge from