Fix for Issue #11411
Merge branch 'master' into pr/11614

Conflicts:
	dist/css/bootstrap.min.css