Merged revisions 259833 via svnmerge from