Merged revisions 282468 via svnmerge from