New 2.1.2 branch changes for Ruby 2.1.2 upgrade
Merge branch 'pr-132'