a sync from 0.8.11cvs4