Merged revisions 304950 via svnmerge from