Merged revisions 296230 via svnmerge from