Merged revisions 259352 via svnmerge from