sync with 0.9.11cvs17 HEAD