Merged revisions 259531 via svnmerge from