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

diff --combined Gemfile.lock
index 8a28aa878e3c95a61d62ee4abcccddc91472ea1a,4baeb6243f82c1d06cc7a174fcfffbed2d0b27e1..b47c857d089edf996950945efa7a802b148b2b51
--- 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.1.2)
+     autoprefixer-rails (10.0.1.3)
        execjs
      aws-eventstream (1.1.0)
      aws-partitions (1.383.0)
@@@ -89,7 -89,7 +89,7 @@@
        aws-sigv4 (~> 1.1)
      aws-sigv4 (1.2.2)
        aws-eventstream (~> 1, >= 1.0.2)
 -    better_errors (2.8.3)
 +    better_errors (2.9.0)
        coderay (>= 1.0.0)
        erubi (>= 1.0.0)
        rack (>= 0.9.0)