Merge branch 'master' into dependabot/bundler/rb-inotify-0.10.0

Author: kenyonj

Gemfile.lock

@@ -16,7 +16,7 @@ GEM
     colorize (0.8.1)
     commonmarker (0.17.13)
       ruby-enum (~> 0.5)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.4)
     dnsruby (1.61.2)
       addressable (~> 2.5)
     em-websocket (0.5.1)