olds: Import from torhve/master.
olds: Import from torhve/master.

Former-commit-id: 37fd3f98a2cb4cc8e39356f6c075ae7a5c227fe8 [formerly 4944922831484d890b47b22ca9ead46ff9cf58f4]
Former-commit-id: e7c40d2916ffbb49c4448659039a3089685f1476
torhve/ivar2,torhve/ivar2,torhve/ivar2,haste/ivar2