Merged revisions 304339 via svnmerge from