Merged revisions 304466 via svnmerge from