fixes #7163
rebuild
Merge branch '3.0.0-wip' into 3.0.0-sass-wip

Conflicts:
	docs/assets/js/bootstrap.min.js