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

diff --cc app/assets/stylesheets/_bootstrap-custom.scss
index 6bbaecbe480f40a8a03473f69d3ba28ae37af1ae,1c3629aa868b3ba4af46ce8498b87cf04ef2c0c7..96d37415f33054d54b3615d9c3342106b1a75659
--- 1/app/assets/stylesheets/_bootstrap-custom.scss
--- 2/app/assets/stylesheets/_bootstrap-custom.scss
+++ b/app/assets/stylesheets/_bootstrap-custom.scss
@@@ -27,9 -27,9 +27,9 @@@
  @import "bootstrap/card";
  // @import "bootstrap/breadcrumb";
  // @import "bootstrap/pagination";
 -// @import "bootstrap/badge";
 +@import "bootstrap/badge";
  // @import "bootstrap/jumbotron";
- // @import "bootstrap/alert";
+ @import "bootstrap/alert";
  // @import "bootstrap/progress";
  // @import "bootstrap/media";
  // @import "bootstrap/list-group";

diff --cc app/assets/stylesheets/common.scss
Simple merge