Merge upstream Ruby 2.1.4

cc @github/mri-hackers