Update ruby
Merge branch 'develop'