Merged revisions 258029 via svnmerge from