Merged revisions 304097 via svnmerge from