Merge pull request #2459 from alex/pypy-4

pypy 4.0.0