Update to Ruby 2.1.0p0
Merge origin/master