[pypy-dev] Branch merged