Upgrade to Ruby 2.1.3
Merge branch 'master' into bootstrap