Merged revisions 302600 via svnmerge from