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

diff --combined Gemfile.lock
index ee7e2521529b83fa31be5e975d21196705c5b51a,68de1f478a3425d207950292cf04429ae0710cde..fae8b859451596e3ae45ecae8dc8f9a87ad27d29
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -114,7 -114,7 +114,7 @@@ GE
        actionpack (>= 5.2)
        activemodel (>= 5.2)
      brakeman (4.9.1)
-     browser (4.2.0)
+     browser (5.0.0)
      builder (3.2.4)
      bzip2-ffi (1.0.0)
        ffi (~> 1.0)
@@@ -390,7 -390,7 +390,7 @@@
      rexml (3.2.4)
      rinku (2.0.6)
      rotp (6.1.0)
 -    rubocop (0.91.0)
 +    rubocop (0.91.1)
        parallel (~> 1.10)
        parser (>= 2.7.1.1)
        rainbow (>= 2.2.2, < 4.0)