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

diff --combined Gemfile.lock
index b0a16c255c3dc2a2834a6f80fcc97642dd6e00e4,04befa66db027661cc73d94fed007f79f5b57fe7..71317a646dc5bb4a1ea030f046b27406fded2510
--- 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.0)
 +    listen (3.3.1)
        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.19.2)
+     parallel (1.20.0)
      parser (2.7.2.0)
        ast (~> 2.4.1)
      pg (1.2.3)
@@@ -399,12 -399,12 +399,12 @@@
        rubocop-ast (>= 0.6.0)
        ruby-progressbar (~> 1.7)
        unicode-display_width (>= 1.4.0, < 2.0)
-     rubocop-ast (0.8.0)
+     rubocop-ast (1.1.1)
        parser (>= 2.7.1.5)
      rubocop-minitest (0.10.1)
        rubocop (>= 0.87)
-     rubocop-performance (1.8.1)
-       rubocop (>= 0.87.0)
+     rubocop-performance (1.9.0)
+       rubocop (>= 0.90.0, < 2.0)
        rubocop-ast (>= 0.4.0)
      rubocop-rails (2.8.1)
        activesupport (>= 4.2.0)