Merge branch 'hotfix/2.3.6'

* hotfix/2.3.6:
  * Deploy with ruby 2.0.0-p353 * Updated gems
* Updated gems
Merge branch 'hotfix/2.3.7' into develop

* hotfix/2.3.7:
  * Updated gems