Merge remote-tracking branch 'upstream/pull/2892'

diff --combined Gemfile.lock
index 57edb880ebc21d22a91d94052a82903cc1d42905,2b6eb8418282211a6e86246354a46ca0d2a12cf0..3285ad50576faca880ae14201137b70a431e3a70
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -209,9 -209,8 +209,9 @@@ GE
      factory_bot_rails (6.1.0)
        factory_bot (~> 6.1.0)
        railties (>= 5.0.0)
 -    faraday (1.0.1)
 +    faraday (1.1.0)
        multipart-post (>= 1.2, < 3)
 +      ruby2_keywords
      ffi (1.13.1)
      ffi-libarchive (1.0.4)
        ffi (~> 1.0)
@@@ -412,7 -411,6 +412,7 @@@
        rubocop (>= 0.87.0)
      ruby-openid (2.9.2)
      ruby-progressbar (1.10.1)
 +    ruby2_keywords (0.0.2)
      rubyzip (2.3.0)
      sanitize (5.2.1)
        crass (~> 1.0.2)
@@@ -461,7 -459,7 +461,7 @@@
      validates_email_format_of (1.6.3)
        i18n
      vendorer (0.2.0)
-     webmock (3.9.2)
+     webmock (3.9.3)
        addressable (>= 2.3.6)
        crack (>= 0.3.2)
        hashdiff (>= 0.4.0, < 2.0.0)