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

diff --combined Gemfile.lock
index 1c2d967fcd3a89130d411918774919ce5a8655bf,abdcdfb86f0b3da74f1e06909fd17cf0c0c1ece4..10cded38531edf4bd026f7a50a606270d39cec3b
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -113,7 -113,7 +113,7 @@@ GE
      bootstrap_form (4.5.0)
        actionpack (>= 5.2)
        activemodel (>= 5.2)
 -    brakeman (4.9.1)
 +    brakeman (4.10.0)
      browser (5.0.0)
      builder (3.2.4)
      bzip2-ffi (1.0.0)
@@@ -280,7 -280,7 +280,7 @@@
      multi_json (1.15.0)
      multi_xml (0.6.0)
      multipart-post (2.1.1)
-     nio4r (2.5.3)
+     nio4r (2.5.4)
      nokogiri (1.10.10)
        mini_portile2 (~> 2.4.0)
      nokogumbo (2.0.2)
@@@ -333,7 -333,7 +333,7 @@@
      progress (3.5.2)
      psych (3.2.0)
      public_suffix (4.0.6)
-     puma (4.3.6)
+     puma (5.0.2)
        nio4r (~> 2.0)
      quad_tile (1.0.1)
      r2 (0.2.7)
@@@ -536,7 -536,7 +536,7 @@@ DEPENDENCIE
    openstreetmap-deadlock_retry (>= 1.3.0)
    pg
    psych
-   puma (~> 4.3)
+   puma (~> 5.0)
    quad_tile (~> 1.0.1)
    r2 (~> 0.2.7)
    rack-cors