Merged revisions 259018 via svnmerge from