Merge branch 'master' into develop
Gem update
Gem update
Merge branch 'release/1.0.2'