sync with 0.8.6cvs11