diff --git a/.ruby-version b/.ruby-version
index 57cf282eb..860487ca1 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.6.5
+2.7.1
diff --git a/.tool-versions b/.tool-versions
index 78115053c..a9e31a478 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1 +1 @@
-ruby 2.6.5
+ruby 2.7.1
diff --git a/.travis.yml b/.travis.yml
index a5241375b..a9a6b1061 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,9 +7,10 @@ env:
     - DATABASE_ADAPTER=sqlite3
     - DATABASE_ADAPTER=postgresql
 rvm:
-  - 2.6.5
-  - 2.5.7
-  - 2.4.9
+  - 2.7.1
+  - 2.6.6
+  - 2.5.8
+  - 2.4.10
 gemfile:
   - gemfiles/rails_6_0.gemfile
   - gemfiles/rails_5_2.gemfile
@@ -18,16 +19,26 @@ gemfile:
   - gemfiles/rails_4_2.gemfile
 matrix:
   exclude:
-    - rvm: 2.6.5
+    - rvm: 2.7.1
       gemfile: gemfiles/rails_4_2.gemfile
-    - rvm: 2.4.9
+    - rvm: 2.6.6
+      gemfile: gemfiles/rails_4_2.gemfile
+    - rvm: 2.4.10
       gemfile: gemfiles/rails_6_0.gemfile
 cache: bundler
 # Source: <https://docs.travis-ci.com/user/languages/ruby/#bundler-20>
 before_install:
   - nvm install 12
-  - gem update --system '2.7.8' --no-document
-  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
-  - gem install bundler -v '< 2' --no-document
+#  Use Bundler 1.x for Ruby 2.4/2.5 and Rails 4.2
+  - |
+    if ruby --version | grep -E "2.(4|5)."
+    then
+      gem update --system '2.7.8' --no-document
+      gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+      gem install bundler -v '< 2' --no-document
+    else
+      gem update --system --no-document
+      gem update bundler --no-document
+    fi
 install: "bundle install --jobs=3 --retry=3"
 script: "bundle exec rake"
diff --git a/Gemfile b/Gemfile
index 2a0bc09cf..749cfe4e2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'appraisal', '2.2.0'
-gem 'bundler', '~> 1.1'
+gem 'bundler'
 gem 'pry'
 gem 'pry-byebug'
 gem 'rake', '13.0.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index b361252be..4c2d79dee 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -63,7 +63,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (= 2.2.0)
-  bundler (~> 1.1)
+  bundler
   fssm
   pry
   pry-byebug
@@ -77,4 +77,4 @@ DEPENDENCIES
   zeus
 
 BUNDLED WITH
-   1.17.3
+   2.1.4
diff --git a/gemfiles/rails_4_2.gemfile b/gemfiles/rails_4_2.gemfile
index e5bead64e..94320f301 100644
--- a/gemfiles/rails_4_2.gemfile
+++ b/gemfiles/rails_4_2.gemfile
@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "appraisal", "2.2.0"
-gem "bundler", "~> 1.1"
+gem "bundler"
 gem "pry"
 gem "pry-byebug"
 gem "rake", "13.0.1"
diff --git a/gemfiles/rails_5_0.gemfile b/gemfiles/rails_5_0.gemfile
index 91f2a1ae6..0547f22e0 100644
--- a/gemfiles/rails_5_0.gemfile
+++ b/gemfiles/rails_5_0.gemfile
@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "appraisal", "2.2.0"
-gem "bundler", "~> 1.1"
+gem "bundler"
 gem "pry"
 gem "pry-byebug"
 gem "rake", "13.0.1"
diff --git a/gemfiles/rails_5_0.gemfile.lock b/gemfiles/rails_5_0.gemfile.lock
index 3515c7a41..7e280f5b1 100644
--- a/gemfiles/rails_5_0.gemfile.lock
+++ b/gemfiles/rails_5_0.gemfile.lock
@@ -210,7 +210,7 @@ PLATFORMS
 DEPENDENCIES
   appraisal (= 2.2.0)
   bcrypt (~> 3.1.7)
-  bundler (~> 1.1)
+  bundler
   fssm
   jbuilder (~> 2.5)
   jquery-rails
@@ -239,4 +239,4 @@ DEPENDENCIES
   zeus
 
 BUNDLED WITH
-   1.17.3
+   2.1.4
diff --git a/gemfiles/rails_5_1.gemfile b/gemfiles/rails_5_1.gemfile
index 7ff5c2c23..c7abcd0d7 100644
--- a/gemfiles/rails_5_1.gemfile
+++ b/gemfiles/rails_5_1.gemfile
@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "appraisal", "2.2.0"
-gem "bundler", "~> 1.1"
+gem "bundler"
 gem "pry"
 gem "pry-byebug"
 gem "rake", "13.0.1"
diff --git a/gemfiles/rails_5_1.gemfile.lock b/gemfiles/rails_5_1.gemfile.lock
index b8e21fd33..ed92cd9b0 100644
--- a/gemfiles/rails_5_1.gemfile.lock
+++ b/gemfiles/rails_5_1.gemfile.lock
@@ -225,7 +225,7 @@ PLATFORMS
 DEPENDENCIES
   appraisal (= 2.2.0)
   bcrypt (~> 3.1.7)
-  bundler (~> 1.1)
+  bundler
   capybara (~> 2.13)
   fssm
   jbuilder (~> 2.5)
@@ -255,4 +255,4 @@ DEPENDENCIES
   zeus
 
 BUNDLED WITH
-   1.17.3
+   2.1.4
diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_5_2.gemfile
index 6d38c91c2..613538ffb 100644
--- a/gemfiles/rails_5_2.gemfile
+++ b/gemfiles/rails_5_2.gemfile
@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "appraisal", "2.2.0"
-gem "bundler", "~> 1.1"
+gem "bundler"
 gem "pry"
 gem "pry-byebug"
 gem "rake", "13.0.1"
diff --git a/gemfiles/rails_5_2.gemfile.lock b/gemfiles/rails_5_2.gemfile.lock
index 9bee30e42..b8e8b47fe 100644
--- a/gemfiles/rails_5_2.gemfile.lock
+++ b/gemfiles/rails_5_2.gemfile.lock
@@ -243,7 +243,7 @@ DEPENDENCIES
   appraisal (= 2.2.0)
   bcrypt (~> 3.1.7)
   bootsnap (>= 1.1.0)
-  bundler (~> 1.1)
+  bundler
   capybara (~> 3.1.1)
   chromedriver-helper
   fssm
@@ -274,4 +274,4 @@ DEPENDENCIES
   zeus
 
 BUNDLED WITH
-   1.17.3
+   2.1.4
diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile
index 0455c1277..5189a1f20 100644
--- a/gemfiles/rails_6_0.gemfile
+++ b/gemfiles/rails_6_0.gemfile
@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "appraisal", "2.2.0"
-gem "bundler", "~> 1.1"
+gem "bundler"
 gem "pry"
 gem "pry-byebug"
 gem "rake", "13.0.1"
diff --git a/gemfiles/rails_6_0.gemfile.lock b/gemfiles/rails_6_0.gemfile.lock
index b879c43aa..b1b52ec68 100644
--- a/gemfiles/rails_6_0.gemfile.lock
+++ b/gemfiles/rails_6_0.gemfile.lock
@@ -266,7 +266,7 @@ DEPENDENCIES
   appraisal (= 2.2.0)
   bcrypt (~> 3.1.7)
   bootsnap (>= 1.4.2)
-  bundler (~> 1.1)
+  bundler
   capybara (>= 2.15)
   fssm
   jbuilder (~> 2.7)
@@ -298,4 +298,4 @@ DEPENDENCIES
   zeus
 
 BUNDLED WITH
-   1.17.3
+   2.1.4