Merged revisions 304007 via svnmerge from