Merged revisions 259526 via svnmerge from