Merge branch 'master' of https://github.com/twitter/bootstrap into release-2.3.1

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