* Tested against Ruby 2.1.3
Merge branch 'hotfix/2.12.1'

* hotfix/2.12.1:
  * Tested against Ruby 2.1.3