Merged revisions 283230 via svnmerge from