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

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
index de5157c0489f70b845895d3663b1eb1f0bd8d306,a696aaaa94b562cb7aeb5ccb751720b952df46d2..4798189389fd0e70d89c2011ad14788e2c14c9df
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -170,15 -165,15 +170,15 @@@ GE
      exifr (1.3.6)
      factory_bot (5.0.2)
        activesupport (>= 4.2.0)
 -    factory_bot_rails (5.0.1)
 -      factory_bot (~> 5.0.0)
 +    factory_bot_rails (5.0.2)
 +      factory_bot (~> 5.0.2)
        railties (>= 4.2.0)
 -    fakefs (0.20.0)
 +    fakefs (0.20.1)
      faraday (0.15.4)
        multipart-post (>= 1.2, < 3)
 -    ffi (1.10.0)
 -    fspath (3.1.0)
 +    ffi (1.11.1)
 +    fspath (3.1.1)
-     gd2-ffij (0.3.0)
+     gd2-ffij (0.4.0)
        ffi (>= 1.0.0)
      geoip (1.6.4)
      globalid (0.4.2)