Merge branch 'master' into v4

Conflicts:
	Gruntfile.js
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/fonts/glyphicons-halflings-regular.eot
	dist/fonts/glyphicons-halflings-regular.svg
	dist/fonts/glyphicons-halflings-regular.ttf
	dist/fonts/glyphicons-halflings-regular.woff
	docs/_data/glyphicons.yml
	docs/_includes/components/alerts.html
	docs/_includes/components/badges.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/input-groups.html
	docs/_includes/components/labels.html
	docs/_includes/components/media.html
	docs/_includes/components/navbar.html
	docs/_includes/components/navs.html
	docs/_includes/components/pagination.html
	docs/_includes/components/panels.html
	docs/_includes/components/progress-bars.html
	docs/_includes/css/buttons.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/css/helpers.html
	docs/_includes/css/images.html
	docs/_includes/css/less.html
	docs/_includes/css/responsive-utilities.html
	docs/_includes/css/sass.html
	docs/_includes/css/tables.html
	docs/_includes/css/type.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/download.html
	docs/_includes/getting-started/examples.html
	docs/_includes/getting-started/whats-included.html
	docs/_includes/js/affix.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.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/tabs.html
	docs/_includes/nav/components.html
	docs/_includes/nav/css.html
	docs/_includes/nav/javascript.html
	docs/_includes/nav/main.html
	docs/about.html
	docs/assets/css/docs.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css
	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/dist/fonts/glyphicons-halflings-regular.eot
	docs/dist/fonts/glyphicons-halflings-regular.svg
	docs/dist/fonts/glyphicons-halflings-regular.ttf
	docs/dist/fonts/glyphicons-halflings-regular.woff
	docs/examples/carousel/index.html
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/navbar/index.html
	docs/examples/non-responsive/index.html
	docs/examples/non-responsive/non-responsive.css
	docs/examples/sticky-footer-navbar/index.html
	docs/examples/theme/index.html
	fonts/glyphicons-halflings-regular.eot
	fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.ttf
	fonts/glyphicons-halflings-regular.woff
	less/_carousel.less
	less/_forms.less
	less/glyphicons.less

3 files changed, 58 insertions, 42 deletions

diff --git a/docs/layout/grid.md b/docs/layout/grid.md
index c2dc24d94..2ea8a42e8 100644
--- a/docs/layout/grid.md
+++ b/docs/layout/grid.md
@@ -77,49 +77,49 @@ See how aspects of the Bootstrap grid system work across multiple devices with a
     </thead>
     <tbody>
       <tr>
-        <th class="text-nowrap">Grid behavior</th>
+        <th class="text-nowrap" scope="row">Grid behavior</th>
         <td>Horizontal at all times</td>
         <td colspan="3">Collapsed to start, horizontal above breakpoints</td>
       </tr>
       <tr>
-        <th class="text-nowrap">Container width</th>
+        <th class="text-nowrap" scope="row">Container width</th>
         <td>None (auto)</td>
         <td>750px</td>
         <td>970px</td>
         <td>1170px</td>
       </tr>
       <tr>
-        <th class="text-nowrap">Class prefix</th>
+        <th class="text-nowrap" scope="row">Class prefix</th>
         <td><code>.col-xs-</code></td>
         <td><code>.col-sm-</code></td>
         <td><code>.col-md-</code></td>
         <td><code>.col-lg-</code></td>
       </tr>
       <tr>
-        <th class="text-nowrap"># of columns</th>
+        <th class="text-nowrap" scope="row"># of columns</th>
         <td colspan="4">12</td>
       </tr>
       <tr>
-        <th class="text-nowrap">Column width</th>
+        <th class="text-nowrap" scope="row">Column width</th>
         <td class="text-muted">Auto</td>
         <td>~62px</td>
         <td>~81px</td>
         <td>~97px</td>
       </tr>
       <tr>
-        <th class="text-nowrap">Gutter width</th>
+        <th class="text-nowrap" scope="row">Gutter width</th>
         <td colspan="4">30px (15px on each side of a column)</td>
       </tr>
       <tr>
-        <th class="text-nowrap">Nestable</th>
+        <th class="text-nowrap" scope="row">Nestable</th>
         <td colspan="4">Yes</td>
       </tr>
       <tr>
-        <th class="text-nowrap">Offsets</th>
+        <th class="text-nowrap" scope="row">Offsets</th>
         <td colspan="4">Yes</td>
       </tr>
       <tr>
-        <th class="text-nowrap">Column ordering</th>
+        <th class="text-nowrap" scope="row">Column ordering</th>
         <td colspan="4">Yes</td>
       </tr>
     </tbody>
@@ -293,7 +293,7 @@ Don't want your columns to simply stack in smaller devices? Use the extra small
 </div>
 {% endexample %}
 
-### Example: Mobile, tablet, desktops
+### Example: Mobile, tablet, desktop
 
 Build on the previous example by creating even more dynamic and powerful layouts with tablet `.col-sm-*` classes.
 
diff --git a/docs/layout/media.md b/docs/layout/media.md
index 431805c9e..4fc780884 100644
--- a/docs/layout/media.md
+++ b/docs/layout/media.md
@@ -27,9 +27,11 @@ Media components can also be nested.
 
 {% example html %}
 <div class="media">
-  <a class="media-left" href="#">
-    <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
-  </a>
+  <div class="media-left">
+    <a href="#">
+      <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
+    </a>
+  </div>
   <div class="media-body">
     <h4 class="media-heading">Media heading</h4>
     Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.
@@ -52,9 +54,11 @@ The images or other media can be aligned top, middle, or bottom. The default is
 
 {% example html %}
 <div class="media">
-  <a class="media-left" href="#">
-    <img data-src="holder.js/64x64" alt="Generic placeholder image">
-  </a>
+  <div class="media-left">
+    <a href="#">
+      <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
+    </a>
+  </div>
   <div class="media-body">
     <h4 class="media-heading">Top aligned media</h4>
     <p>Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.</p>
@@ -65,9 +69,11 @@ The images or other media can be aligned top, middle, or bottom. The default is
 
 {% example html %}
 <div class="media">
-  <a class="media-left media-middle" href="#">
-    <img data-src="holder.js/64x64" alt="Generic placeholder image">
-  </a>
+  <div class="media-left media-middle">
+    <a href="#">
+      <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
+    </a>
+  </div>
   <div class="media-body">
     <h4 class="media-heading">Middle aligned media</h4>
     <p>Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.</p>
@@ -78,9 +84,11 @@ The images or other media can be aligned top, middle, or bottom. The default is
 
 {% example html %}
 <div class="media">
-  <a class="media-left media-bottom" href="#">
-    <img data-src="holder.js/64x64" alt="Generic placeholder image">
-  </a>
+  <div class="media-left media-bottom">
+    <a href="#">
+      <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
+    </a>
+  </div>
   <div class="media-body">
     <h4 class="media-heading">Bottom aligned media</h4>
     <p>Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.</p>
@@ -96,9 +104,11 @@ With a bit of extra markup, you can use media inside list (useful for comment th
 {% example html %}
 <ul class="media-list">
   <li class="media">
-    <a class="media-left" href="#">
-      <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
-    </a>
+    <div class="media-left">
+      <a href="#">
+        <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
+      </a>
+    </div>
     <div class="media-body">
       <h4 class="media-heading">Media heading</h4>
       <p>Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.</p>
@@ -112,9 +122,11 @@ With a bit of extra markup, you can use media inside list (useful for comment th
           Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.
           <!-- Nested media object -->
           <div class="media">
-            <a class="media-left" href="#">
-              <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
-            </a>
+            <div class="media-left">
+              <a href="#">
+                <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
+              </a>
+            </div>
             <div class="media-body">
               <h4 class="media-heading">Nested media heading</h4>
               Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.
@@ -124,9 +136,11 @@ With a bit of extra markup, you can use media inside list (useful for comment th
       </div>
       <!-- Nested media object -->
       <div class="media">
-        <a class="media-left" href="#">
-          <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
-        </a>
+        <div class="media-left">
+          <a href="#">
+            <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
+          </a>
+        </div>
         <div class="media-body">
           <h4 class="media-heading">Nested media heading</h4>
           Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.
@@ -135,9 +149,11 @@ With a bit of extra markup, you can use media inside list (useful for comment th
     </div>
   </li>
   <li class="media">
-    <a class="media-right" href="#">
-      <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
-    </a>
+    <div class="media-right">
+      <a href="#">
+        <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
+      </a>
+    </div>
     <div class="media-body">
       <h4 class="media-heading">Media heading</h4>
       Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.
diff --git a/docs/layout/responsive-utilities.md b/docs/layout/responsive-utilities.md
index 5191ce6ec..69d4ad604 100644
--- a/docs/layout/responsive-utilities.md
+++ b/docs/layout/responsive-utilities.md
@@ -36,28 +36,28 @@ Use a single or combination of the available classes for toggling content across
     </thead>
     <tbody>
       <tr>
-        <th><code>.visible-xs-*</code></th>
+        <th scope="rowspan"><code>.visible-xs-*</code></th>
         <td class="is-visible">Visible</td>
         <td class="is-hidden">Hidden</td>
         <td class="is-hidden">Hidden</td>
         <td class="is-hidden">Hidden</td>
       </tr>
       <tr>
-        <th><code>.visible-sm-*</code></th>
+        <th scope="rowspan"><code>.visible-sm-*</code></th>
         <td class="is-hidden">Hidden</td>
         <td class="is-visible">Visible</td>
         <td class="is-hidden">Hidden</td>
         <td class="is-hidden">Hidden</td>
       </tr>
       <tr>
-        <th><code>.visible-md-*</code></th>
+        <th scope="rowspan"><code>.visible-md-*</code></th>
         <td class="is-hidden">Hidden</td>
         <td class="is-hidden">Hidden</td>
         <td class="is-visible">Visible</td>
         <td class="is-hidden">Hidden</td>
       </tr>
       <tr>
-        <th><code>.visible-lg-*</code></th>
+        <th scope="rowspan"><code>.visible-lg-*</code></th>
         <td class="is-hidden">Hidden</td>
         <td class="is-hidden">Hidden</td>
         <td class="is-hidden">Hidden</td>
@@ -66,28 +66,28 @@ Use a single or combination of the available classes for toggling content across
     </tbody>
     <tbody>
       <tr>
-        <th><code>.hidden-xs</code></th>
+        <th scope="rowspan"><code>.hidden-xs</code></th>
         <td class="is-hidden">Hidden</td>
         <td class="is-visible">Visible</td>
         <td class="is-visible">Visible</td>
         <td class="is-visible">Visible</td>
       </tr>
       <tr>
-        <th><code>.hidden-sm</code></th>
+        <th scope="rowspan"><code>.hidden-sm</code></th>
         <td class="is-visible">Visible</td>
         <td class="is-hidden">Hidden</td>
         <td class="is-visible">Visible</td>
         <td class="is-visible">Visible</td>
       </tr>
       <tr>
-        <th><code>.hidden-md</code></th>
+        <th scope="rowspan"><code>.hidden-md</code></th>
         <td class="is-visible">Visible</td>
         <td class="is-visible">Visible</td>
         <td class="is-hidden">Hidden</td>
         <td class="is-visible">Visible</td>
       </tr>
       <tr>
-        <th><code>.hidden-lg</code></th>
+        <th scope="rowspan"><code>.hidden-lg</code></th>
         <td class="is-visible">Visible</td>
         <td class="is-visible">Visible</td>
         <td class="is-visible">Visible</td>