Merged revisions 282860 via svnmerge from