Fixes #12210: badges in xs buttons
Merge branch 'master' of github.com:twbs/bootstrap

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