Merge branch 'master' into v4

grunt/bs-commonjs-generator.js

@@ -1,3 +1,10 @@
+/*!
+ * Bootstrap Grunt task for the CommonJS module generation
+ * http://getbootstrap.com
+ * Copyright 2014-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
+
 'use strict';
 
 var fs = require('fs');
@@ -15,8 +22,7 @@ module.exports = function generateCommonJSModule(grunt, srcFiles, destFilepath)
   var moduleOutputJs = COMMONJS_BANNER + srcFiles.map(srcPathToDestRequire).join('\n');
   try {
     fs.writeFileSync(destFilepath, moduleOutputJs);
-  }
-  catch (err) {
+  } catch (err) {
     grunt.fail.warn(err);
   }
   grunt.log.writeln('File ' + destFilepath.cyan + ' created.');

grunt/configBridge.json

@@ -1,12 +1,11 @@
 {
   "paths": {
     "docsJs": [
-
-      "assets/js/vendor/holder.js",
+      "../assets/js/vendor/holder.min.js",
       "assets/js/vendor/jekyll-search.js",
-      "assets/js/vendor/ZeroClipboard.min.js",
-      "assets/js/vendor/anchor.js",
-      "assets/js/src/application.js"
+      "../assets/js/vendor/ZeroClipboard.min.js",
+      "../assets/js/vendor/anchor.js",
+      "../assets/js/src/application.js"
     ]
   },
   "config": {

grunt/sauce_browsers.yml

@@ -46,7 +46,7 @@
   {
     browserName: "iphone",
     platform: "OS X 10.10",
-    version: "8.1"
+    version: "8.2"
   },
 
   # iOS Chrome not currently supported by Sauce Labs