Upgrade to Ruby 2.1.2
Merge branch 'master' into bootstrap