Conflicts:
	.travis.yml
	Gruntfile.js
	bower.json
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.js
	dist/js/bootstrap.min.js
	docs/_data/glyphicons.yml
	docs/_includes/components/breadcrumbs.html
	docs/_includes/components/button-dropdowns.html
	docs/_includes/components/button-groups.html
	docs/_includes/components/dropdowns.html
	docs/_includes/components/glyphicons.html
	docs/_includes/components/labels.html
	docs/_includes/components/list-group.html
	docs/_includes/components/media.html
	docs/_includes/components/navs.html
	docs/_includes/components/panels.html
	docs/_includes/components/progress-bars.html
	docs/_includes/components/thumbnails.html
	docs/_includes/components/wells.html
	docs/_includes/css/buttons.html
	docs/_includes/css/forms.html
	docs/_includes/css/helpers.html
	docs/_includes/css/images.html
	docs/_includes/css/less.html
	docs/_includes/customizer-variables.html
	docs/_includes/getting-started/acces...

Use different way to make failing test more visible in Sauce

[Fixes #15928] Encourage use of icons with form validation states for co...

[Fixes #15928] Encourage use of icons with form validation states for colorblind users

Update text per @patrickhlauke's feedback

Update text per @patrickhlauke's feedback.

Fix stupid grammar mistake

Add Ruby Gem badge to README

[Fixes #15825] .initialism class should use mixin

Update all collapse triggers with .collapsed class and aria-expanded

Fixes #15741
Closes #15751 by merging it.

Unit tests: Use new names of module hooks

Refs http://qunitjs.com/upgrade-guide-2.x/#replace-qunit-jsdump-with-qunit-dump

Refs http://qunitjs.com/upgrade-guide-2.x/#replace-qunit-log-callback-with-qunit-log-callback-for-all-reporting-callbacks

Refs #15893

Modal: Apply any preexisting body padding again after closing

Closes #15291 by merging it.

Fixed performance bug where a tooltip element is created and then immediately destroyed when tooltip.hide() is called and there is no existing tooltip element

Resolves #15557 by merging it.

Fixes #15147.
Closes #15520 by merging it.

[Ref #15881] Use Explicit JS Variable Declarations rather than Chained

tip method in popover.js can be removed

[Ref #15881] Use Explicit Values for javascript variables rather than chained ones.

From https://github.com/twbs/bootstrap/pull/15881#discussion_r25330647

Add source code documentation of justified navbar for #15906

docs > js > headings

Document in the source code that the justified nav is meant for single line list items only. This should help prevent Issues like #15906 in the future.

Fixes #15106.
Closes #15910.