Merged revisions 302713 via svnmerge from