Merged revisions 302834 via svnmerge from