Merge branch 'update-gemfile'