Update Gemfile
Merge branch 'master' into js-subscriptions