Merge branch 'master' into dependabot/bundler/rexml-3.2.6

Author: woodruffw

Gemfile.lock

@@ -9,7 +9,7 @@ GEM
     docile (1.4.0)
     iniparse (1.5.0)
     json (2.6.3)
-    minitest (5.18.1)
+    minitest (5.19.0)
     overcommit (0.60.0)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)