Update gems
Fix deprecation warnings.
Merge branch 'staging'