Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
	docs/assets/css/bootstrap.css
	less/type.less

diff --cc docs/assets/css/bootstrap.css
Simple merge

diff --cc docs/base-css.html
Simple merge

diff --cc less/carousel.less
Simple merge

diff --cc less/mixins.less
Simple merge

diff --cc less/tests/css-tests.css
Simple merge

diff --cc less/tests/css-tests.html
Simple merge