Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 group :development, :test do
-  gem 'jekyll', '~> 3.1.0'
+  gem 'jekyll', '~> 3.1.1'
   gem 'jekyll-redirect-from', '~> 0.9.1'
   gem 'jekyll-sitemap', '~> 0.10.0'
   gem 'sass', '~> 3.4.21'

Gemfile.lock

@@ -4,7 +4,7 @@ GEM
     colorator (0.1)
     ffi (1.9.10)
     ffi (1.9.10-x64-mingw32)
-    jekyll (3.1.0)
+    jekyll (3.1.1)
       colorator (~> 0.1)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
@@ -28,7 +28,7 @@ GEM
     mercenary (0.3.5)
     rake (10.5.0)
     rb-fsevent (0.9.7)
-    rb-inotify (0.9.5)
+    rb-inotify (0.9.6)
       ffi (>= 0.5.0)
     rouge (1.10.1)
     safe_yaml (1.0.4)
@@ -42,7 +42,7 @@ PLATFORMS
   x64-mingw32
 
 DEPENDENCIES
-  jekyll (~> 3.1.0)
+  jekyll (~> 3.1.1)
   jekyll-redirect-from (~> 0.9.1)
   jekyll-sitemap (~> 0.10.0)
   sass (~> 3.4.21)

package.json

@@ -42,7 +42,7 @@
     "grunt-contrib-connect": "~0.11.2",
     "grunt-contrib-copy": "~0.8.1",
     "grunt-contrib-cssmin": "~0.14.0",
-    "grunt-contrib-qunit": "~0.7.0",
+    "grunt-contrib-qunit": "~1.0.1",
     "grunt-contrib-sass": "^0.9.2",
     "grunt-contrib-uglify": "~0.11.0",
     "grunt-contrib-watch": "~0.6.1",
@@ -51,7 +51,7 @@
     "grunt-exec": "~0.4.6",
     "grunt-html": "~5.0.0",
     "grunt-jekyll": "~0.4.2",
-    "grunt-jscs": "~2.6.0",
+    "grunt-jscs": "~2.7.0",
     "grunt-line-remover": "0.0.2",
     "grunt-postcss": "^0.7.0",
     "grunt-sass": "^1.0.0",
@@ -63,7 +63,7 @@
     "markdown-it": "^5.0.0",
     "mq4-hover-shim": "^0.3.0",
     "npm-shrinkwrap": "^200.1.0",
-    "shelljs": "^0.5.3",
+    "shelljs": "^0.6.0",
     "time-grunt": "^1.2.1"
   },
   "engines": {