Upgrade to PyPy 2.3.1