Merged revisions 304866 via svnmerge from