Bump Ruby to 2.1.2
Merge branch 'master' into ruby-21-tuned-73084732
Merge master and fix conflict
Merge pull request #388 from G5/ruby-21-tuned-73084732

Ruby 2.1.2 tuned 73084732