ruby/ruby — pull request #559 by dbussink (2014-03-10 12:35:32+00:00)
Title: Merge upstream 2.1.1

This merges all upstream changes from the 2.1.1 tag.

/cc @charliesome @tmm1