Update gems
Merge branch 'update_gems'