Porting autoWHO fix (r809) from branches/0.3 to trunk.