Update ruby and gemset
Merge branch 'develop'