sync with 0.9.1cvs1