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

diff --cc Gemfile
index 7076b8c1f1997995fd42f9de5001448e841f073d,8be817547ef6ae92b4285ebb363ebc562db0df9f..8f0d29d5a9df16c0001dbf80b8320747fe33d00b
--- 1/Gemfile
--- 2/Gemfile
+++ b/Gemfile
@@@ -45,9 -45,10 +45,9 @@@ gem "sprockets-exporters_pack
  gem "actionpack-page_caching", ">= 1.2.0"
  gem "activerecord-import"
  gem "active_record_union"
- gem "bootstrap", :github => "gravitystorm/bootstrap-rubygem", :branch => "dartsass_5_2_3"
+ gem "bootstrap", :github => "twbs/bootstrap-rubygem", :ref => "fde1edff90d9219bbef48ecc6a65f13835269bcd"
  gem "bootstrap_form", "~> 5.0"
  gem "cancancan"
 -gem "composite_primary_keys", "~> 14.0.0"
  gem "config"
  gem "delayed_job_active_record"
  gem "frozen_record"

diff --cc Gemfile.lock
Simple merge