Update to CVS snapshot, for testing