quick hack to get it working with pypy/pypycore
Merge remote-tracking branch 'schmir/pypy-hacks'