Merged revisions 260801 via svnmerge from