Two patches in one zip file, one for 0.4.0 and other for CVS head