sync with 0.8.10cvs12