PyPy 2.1

Closes #21587.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>