* Ruby 2.1.3
* Updated gems
Merge branch 'hotfix/8.0.3'

* hotfix/8.0.3:
  * Ruby 2.1.3 * Updated gems
fixed merge conflicts