Merge branch 'develop'
Gem update
Merge branch 'master' into develop