Update gems
Merge branch 'update-gems'