Fixes #12934
Merge branch 'master' into popovers-use-radii-var

Conflicts:
	dist/css/bootstrap.css.map
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap.css.map