Merge branch 'master' into dependabot/bundler/html-pipeline-2.11.1

Author: kenyonj

Gemfile.lock

@@ -223,7 +223,7 @@ GEM
       forwardable-extended (~> 2.6)
     public_suffix (3.1.1)
     rainbow (3.0.0)
-    rake (12.3.2)
+    rake (12.3.3)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)