0.9.x branch pypy compatibility