huge CVS merge, see ChangeLog for details.