* Ruby 2.2 compatibility
Merge branch 'hotfix/2.16.1'

* hotfix/2.16.1:
  * Ruby 2.2 compatibility