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

1 files changed, 10 insertions, 10 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.