Merge branch 'master' into derp

Conflicts:
	Gruntfile.js
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/components/button-groups.html
	docs/_includes/components/jumbotron.html
	docs/_includes/components/media.html
	docs/_includes/components/navs.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/js/carousel.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/getting-started.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/browser-bugs.html
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/examples/justified-nav/index.html
	less/_forms.less
	less/_tooltip.less
	less/navs.less
	less/theme.less

2 files changed, 8 insertions, 8 deletions

diff --git a/docs/components/button-group.md b/docs/components/button-group.md
index 178245e94..370f4afcc 100644
--- a/docs/components/button-group.md
+++ b/docs/components/button-group.md
@@ -178,16 +178,16 @@ Just wrap a series of `.btn`s in `.btn-group.btn-group-justified`.
 
 <div class="bs-example">
   <div class="btn-group btn-group-justified">
-    <a class="btn btn-secondary" role="button">Left</a>
-    <a class="btn btn-secondary" role="button">Middle</a>
-    <a class="btn btn-secondary" role="button">Right</a>
+    <a class="btn btn-secondary" href="#" role="button">Left</a>
+    <a class="btn btn-secondary" href="#" role="button">Middle</a>
+    <a class="btn btn-secondary" href="#" role="button">Right</a>
   </div>
   <br>
   <div class="btn-group btn-group-justified">
-    <a class="btn btn-secondary" role="button">Left</a>
-    <a class="btn btn-secondary" role="button">Middle</a>
+    <a class="btn btn-secondary" href="#" role="button">Left</a>
+    <a class="btn btn-secondary" href="#" role="button">Middle</a>
     <div class="btn-group">
-      <a class="btn btn-secondary dropdown-toggle" data-toggle="dropdown">
+      <a class="btn btn-secondary dropdown-toggle" href="#" data-toggle="dropdown">
         Dropdown
       </a>
       <ul class="dropdown-menu" role="menu">
diff --git a/docs/components/jumbotron.md b/docs/components/jumbotron.md
index 080133ed5..b32dd4379 100644
--- a/docs/components/jumbotron.md
+++ b/docs/components/jumbotron.md
@@ -9,7 +9,7 @@ A lightweight, flexible component that can optionally extend the entire viewport
 <div class="jumbotron">
   <h1 class="jumbotron-heading">Hello, world!</h1>
   <p class="lead">This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p>
-  <p class="lead"><a class="btn btn-primary btn-lg" role="button">Learn more</a></p>
+  <p class="lead"><a class="btn btn-primary btn-lg" href="#" role="button">Learn more</a></p>
 </div>
 {% endexample %}
 
@@ -30,6 +30,6 @@ Jumbotrons also come with an adaptive `hr`—just add `.jumbotron-hr` to the ele
   <h1 class="jumbotron-heading">Jumbotron <code>hr</code></h1>
   <p class="lead">This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p>
   <hr class="jumbotron-hr">
-  <p class="lead"><a class="btn btn-primary btn-lg" role="button">Learn more</a></p>
+  <p class="lead"><a class="btn btn-primary btn-lg" href="#" role="button">Learn more</a></p>
 </div>
 {% endexample %}