Merged revisions 259270 via svnmerge from