Update to upstream 2.1.5

cc @github/mri-hackers