Merged revisions 259664 via svnmerge from