Merge remote-tracking branch 'upstream/pull/2987' into master

diff --combined Gemfile.lock
index d5be32119705efea02c1b2c47702ebb34ab7ad93,73f51d519255d49440fe247309df41a22184aeb3..9534ca4fb6f3ed3304f20b52d71abb49b4351452
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -254,7 -254,7 +254,7 @@@ GE
      kramdown (2.3.0)
        rexml
      libxml-ruby (3.2.1)
-     listen (3.3.1)
+     listen (3.3.3)
        rb-fsevent (~> 0.10, >= 0.10.3)
        rb-inotify (~> 0.9, >= 0.9.10)
      logstash-event (1.2.02)
@@@ -325,7 -325,7 +325,7 @@@
        multi_json (~> 1.12)
        omniauth-oauth2 (~> 1.4)
      openstreetmap-deadlock_retry (1.3.0)
 -    parallel (1.20.0)
 +    parallel (1.20.1)
      parser (2.7.2.0)
        ast (~> 2.4.1)
      pg (1.2.3)
@@@ -399,11 -399,11 +399,11 @@@
        rubocop-ast (>= 0.6.0)
        ruby-progressbar (~> 1.7)
        unicode-display_width (>= 1.4.0, < 2.0)
 -    rubocop-ast (1.1.1)
 +    rubocop-ast (1.2.0)
        parser (>= 2.7.1.5)
      rubocop-minitest (0.10.1)
        rubocop (>= 0.87)
 -    rubocop-performance (1.9.0)
 +    rubocop-performance (1.9.1)
        rubocop (>= 0.90.0, < 2.0)
        rubocop-ast (>= 0.4.0)
      rubocop-rails (2.8.1)