Merge branch 'release-2.0' into develop
Update faraday
Update json & multi_json
Update hashie
Merge branch 'topic/am_update-dependencies' into develop
Merge branch 'develop'