Merged revisions 285484 via svnmerge from