Update ruby
Merge branch 'develop' into update-rails403