fix #9941
Merge branch 'master' of https://github.com/charnog/bootstrap into charnog-master

Conflicts:
	dist/css/bootstrap.min.css