Merge branch 'hotfix/4.0.2'

* hotfix/4.0.2:
  * Updated gems * update ruby for CVE-2013-6393
  update ruby for CVE-2013-6393
* Updated gems
Merge branch 'hotfix/4.0.3' into develop

* hotfix/4.0.3:
  * Updated gems