Merge branch 'hotfix/0.18.3'

* hotfix/0.18.3:
  Fixed specs to work with webmock 1.20.4
  Updated gems
* Updated gems
Merge branch 'hotfix/0.18.4' into develop

* hotfix/0.18.4:
  * Updated gems