Merged revisions 285455 via svnmerge from