Merge branch '2.1.2-wip' into exploratory

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

diff --cc docs/components.html
Simple merge

diff --cc docs/templates/pages/components.mustache
Simple merge

diff --cc less/pagination.less
Simple merge

diff --cc less/sprites.less
Simple merge