sync with 0.9.10cvs11