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

diff --combined Gemfile.lock
index 3678ab6b27166000e5f7913a6932f411961f8361,ef02cf6e506921c5c82878bff04882e203a3a11c..a7d9fbf2897710301e2721466da112bd3657120a
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -71,7 -71,7 +71,7 @@@ GE
        activerecord (>= 3.2, < 7.0)
        rake (>= 10.4, < 14.0)
      ast (2.4.1)
-     autoprefixer-rails (10.0.2.0)
+     autoprefixer-rails (10.0.3.0)
        execjs
      aws-eventstream (1.1.0)
      aws-partitions (1.397.0)
@@@ -121,7 -121,7 +121,7 @@@
      cancancan (3.1.0)
      canonical-rails (0.2.9)
        rails (>= 4.1, < 6.1)
 -    capybara (3.33.0)
 +    capybara (3.34.0)
        addressable
        mini_mime (>= 0.1.3)
        nokogiri (~> 1.8)