Merged revisions 260345 via svnmerge from