Merge branch 'update_gemfile' into 3-0-stable