Merge branch 'hotfix/4.0.6'

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

* hotfix/4.0.7:
  * Ruby 2.1.1 * Updated gems