Merge branch 'hotfix/4.0.7'

* hotfix/4.0.7:
  * Ruby 2.1.1 * Updated gems
* Updated gems
Merge branch 'hotfix/4.0.8' into develop

* hotfix/4.0.8:
  * Updated gems