Merged revisions 284921 via svnmerge from