Merge branch 'master' into v4

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/accessibility.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/community.html
	docs/_includes/getting-started/examples.html
	docs/_includes/getting-started/grunt.html
	docs/_includes/getting-started/license.html
	docs/_includes/getting-started/template.html
	docs/_includes/header.html
	docs/_includes/js/affix.html
	docs/_includes/js/alerts.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/scrollspy.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/js/transitions.html
	docs/_includes/nav/javascript.html
	docs/_layouts/default.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/vendor/FileSaver.js
	docs/assets/js/vendor/autoprefixer.js
	docs/assets/js/vendor/uglify.min.js
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/js/bootstrap.min.js
	docs/examples/blog/index.html
	docs/examples/carousel/index.html
	docs/examples/cover/index.html
	docs/examples/dashboard/index.html
	docs/examples/narrow-jumbotron/narrow-jumbotron.css
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/non-responsive/non-responsive.css
	docs/examples/theme/index.html
	grunt/configBridge.json
	js/affix.js
	js/carousel.js
	js/collapse.js
	js/dropdown.js
	js/modal.js
	js/popover.js
	js/scrollspy.js
	js/tab.js
	js/tests/unit/affix.js
	js/tests/unit/button.js
	js/tests/unit/carousel.js
	js/tests/unit/modal.js
	js/tests/unit/tooltip.js
	js/tooltip.js
	less/badges.less
	less/glyphicons.less
	less/type.less
	less/variables.less
	package.json
	scss/_dropdown.scss
	scss/_forms.scss
	test-infra/npm-shrinkwrap.json

2 files changed, 23 insertions, 3 deletions

diff --git a/docs/_data/browser-bugs.yml b/docs/_data/browser-bugs.yml
index 1feb7c312..690efef74 100644
--- a/docs/_data/browser-bugs.yml
+++ b/docs/_data/browser-bugs.yml
@@ -80,6 +80,16 @@
 
 -
   browser: >
+    Chrome (OS X)
+  summary: >
+    Caps Lock indicator not shown in `<input type="password">` with `display: block`
+  upstream_bug: >
+    Chromium#460200
+  origin: >
+    Bootstrap#15832
+
+-
+  browser: >
     Chrome
   summary: >
     `display: table;` within `display: block;` forces sibling content to new line.
@@ -172,6 +182,16 @@
 
 -
   browser: >
+    Safari (OS X)
+  summary: >
+    Caps Lock indicator not shown in `<input type="password">` with `display: block`
+  upstream_bug: >
+    WebKit#141804, Safari#19892433
+  origin: >
+    Bootstrap#15832
+
+-
+  browser: >
     Safari (iOS)
   summary: >
     `transform: translate3d(0,0,0);` rendering bug.
diff --git a/docs/_data/translations.yml b/docs/_data/translations.yml
index 0978cd1fe..2340b99f1 100644
--- a/docs/_data/translations.yml
+++ b/docs/_data/translations.yml
@@ -11,7 +11,7 @@
 - name: French
   code: fr
   description: Bootstrap en Français
-  url: http://www.oneskyapp.com/docs/bootstrap/fr
+  url: http://www.oneskyapp.com/fr/docs/bootstrap/getting-started/
 
 - name: German
   code: de
@@ -31,12 +31,12 @@
 - name: Russian
   code: ru
   description: Bootstrap по-русски
-  url: http://www.oneskyapp.com/docs/bootstrap/ru
+  url: http://www.oneskyapp.com/ru/docs/bootstrap/
 
 - name: Spanish
   code: es
   description: Bootstrap en Español
-  url: http://www.oneskyapp.com/docs/bootstrap/es
+  url: http://www.oneskyapp.com/es/docs/bootstrap/
 
 - name: Ukrainian
   code: uk