Merged revisions 284477 via svnmerge from