fix failed merge of version 0.67

I tried to resolve all conflicts. Please review my guess and merge if they are OK.