Bring alpha branch up to latest cvs head
Bring up to CVS head