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

diff --combined Gemfile.lock
index bf4c5940452fecba4f06a0f9f1f8c310537376f2,a0413e0fcfe32a26029b12dbe2ba11f3cfb28be2..339f336d0b3d1ad97fee26f6df4caa415d83b98c
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -275,7 -275,7 +275,7 @@@ GE
      mini_magick (4.10.1)
      mini_mime (1.0.2)
      mini_portile2 (2.4.0)
-     minitest (5.14.1)
+     minitest (5.14.2)
      msgpack (1.3.3)
      multi_json (1.15.0)
      multi_xml (0.6.0)
@@@ -390,7 -390,7 +390,7 @@@
      rexml (3.2.4)
      rinku (2.0.6)
      rotp (6.1.0)
 -    rubocop (0.89.1)
 +    rubocop (0.90.0)
        parallel (~> 1.10)
        parser (>= 2.7.1.1)
        rainbow (>= 2.2.2, < 4.0)