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

diff --combined Gemfile.lock
index c28d43cc10cb3c19b221bce70cd73565423db177,a82a334911947bc438f5ebc93bad032e289ee39b..38991f57fe102bd5fb3d82d07b3dad40bb7e1522
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -241,7 -241,7 +241,7 @@@ GE
        sprockets
      image_size (2.0.2)
      in_threads (1.5.4)
 -    jbuilder (2.10.0)
 +    jbuilder (2.10.1)
        activesupport (>= 5.0.0)
      jmespath (1.4.0)
      jquery-rails (4.4.0)
@@@ -332,7 -332,7 +332,7 @@@
      popper_js (1.16.0)
      progress (3.5.2)
      psych (3.2.0)
-     public_suffix (4.0.5)
+     public_suffix (4.0.6)
      puma (4.3.6)
        nio4r (~> 2.0)
      quad_tile (1.0.1)
@@@ -460,7 -460,7 +460,7 @@@
      validates_email_format_of (1.6.3)
        i18n
      vendorer (0.2.0)
-     webmock (3.8.3)
+     webmock (3.9.1)
        addressable (>= 2.3.6)
        crack (>= 0.3.2)
        hashdiff (>= 0.4.0, < 2.0.0)