Merge branch 'master' into pr/12412

Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	test-infra/npm-shrinkwrap.canonical.json

test-infra/s3_cache.py

@@ -87,7 +87,7 @@ if __name__ == '__main__':
     mode, friendly_name, dependencies_file, directory = argv
 
     conn = S3Connection()
-    bucket = conn.lookup(BUCKET_NAME)
+    bucket = conn.lookup(BUCKET_NAME, validate=False)
     if bucket is None:
         raise SystemExit("Could not access bucket!")
 

test-infra/sauce_browsers.yml

@@ -5,11 +5,11 @@
     browserName: "safari",
     platform: "OS X 10.9"
   },
-  {
-    browserName: "chrome",
-    platform: "OS X 10.9",
-    version: "31"
-  },
+  # {
+  #   browserName: "googlechrome",
+  #   platform: "OS X 10.9",
+  #   version: "31"
+  # },
   {
     browserName: "firefox",
     platform: "OS X 10.9"
@@ -45,7 +45,7 @@
   # },
 
   {
-    browserName: "chrome",
+    browserName: "googlechrome",
     platform: "Windows 8.1"
   },
   {
@@ -65,7 +65,7 @@
 
   # Linux (unofficial)
   {
-    browserName: "chrome",
+    browserName: "googlechrome",
     platform: "Linux"
   },
   {

test-infra/shrinkwrap.js

@@ -1,24 +0,0 @@
-/* jshint node: true */
-
-/*
-This Grunt task updates the npm-shrinkwrap.canonical.json file that's used as the key for Bootstrap's npm packages cache.
-This task should be run and the updated file should be committed whenever Bootstrap's dependencies change.
-*/
-
-var canonicallyJsonStringify = require('canonical-json');
-var NON_CANONICAL_FILE = 'npm-shrinkwrap.json';
-var DEST_FILE = 'test-infra/npm-shrinkwrap.canonical.json';
-
-
-function updateShrinkwrap(grunt) {
-  // Assumption: Non-canonical shrinkwrap already generated by prerequisite Grunt task
-  var shrinkwrapData = grunt.file.readJSON(NON_CANONICAL_FILE);
-  grunt.log.writeln('Deleting ' + NON_CANONICAL_FILE.cyan + '...');
-  grunt.file.delete(NON_CANONICAL_FILE);
-  // Output as Canonical JSON in correct location
-  grunt.file.write(DEST_FILE, canonicallyJsonStringify(shrinkwrapData));
-  grunt.log.writeln('File ' + DEST_FILE.cyan + ' updated.');
-}
-
-
-module.exports = updateShrinkwrap;