Merged revisions 302831 via svnmerge from