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

docs/assets/js/customizer.js

@@ -6,14 +6,14 @@
  * details, see http://creativecommons.org/licenses/by/3.0/.
  */
 
-/* jshint multistr:true */
+/* jshint multistr: true */
 
 window.onload = function () { // wait for load in a dumb way because B-0
   var cw = '/*!\n' +
-           ' * Bootstrap v3.0.3 (http://getbootstrap.com)\n' +
+           ' * Bootstrap v3.1.0 (http://getbootstrap.com)\n' +
            ' * Copyright 2011-2014 Twitter, Inc.\n' +
            ' * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n' +
-           ' */\n\n';
+           ' */\n\n'
 
   function showError(msg, err) {
     $('<div id="bsCustomizerAlert" class="bs-customizer-alert">\
@@ -40,9 +40,9 @@ window.onload = function () { // wait for load in a dumb way because B-0
   }
 
   function getQueryParam(key) {
-    key = key.replace(/[*+?^$.\[\]{}()|\\\/]/g, '\\$&'); // escape RegEx meta chars
-    var match = location.search.match(new RegExp('[?&]' + key + '=([^&]+)(&|$)'));
-    return match && decodeURIComponent(match[1].replace(/\+/g, ' '));
+    key = key.replace(/[*+?^$.\[\]{}()|\\\/]/g, '\\$&') // escape RegEx meta chars
+    var match = location.search.match(new RegExp('[?&]' + key + '=([^&]+)(&|$)'))
+    return match && decodeURIComponent(match[1].replace(/\+/g, ' '))
   }
 
   function createGist(configJson) {

docs/assets/js/vendor/filesaver.js

@@ -1,6 +1,6 @@
 /* FileSaver.js
  * A saveAs() FileSaver implementation.
- * 2013-12-27
+ * 2014-01-24
  *
  * By Eli Grey, http://eligrey.com
  * License: X11/MIT
@@ -14,9 +14,15 @@
 /*! @source http://purl.eligrey.com/github/FileSaver.js/blob/master/FileSaver.js */
 
 var saveAs = saveAs
-  || (typeof navigator !== "undefined" && navigator.msSaveOrOpenBlob && navigator.msSaveOrOpenBlob.bind(navigator))
+  // IE 10+ (native saveAs)
+  || (navigator.msSaveOrOpenBlob && navigator.msSaveOrOpenBlob.bind(navigator))
+  // Everyone else
   || (function(view) {
 	"use strict";
+	// IE <10 is explicitly unsupported
+	if (/MSIE [1-9]\./.test(navigator.userAgent)) {
+		return;
+	}
 	var
 		  doc = view.document
 		  // only get URL when necessary in case BlobBuilder.js hasn't overridden it yet

docs/assets/js/vendor/holder.js

@@ -1,6 +1,6 @@
 /*!
 
-Holder - 2.3 - client side image placeholders
+Holder - 2.3.1 - client side image placeholders
 (c) 2012-2014 Ivan Malopinsky / http://imsky.co
 
 Provided under the MIT License.
@@ -9,7 +9,6 @@ Commercial use requires attribution.
 */
 var Holder = Holder || {};
 (function (app, win) {
-
 var system_config = {
 	use_svg: false,
 	use_canvas: false,
@@ -151,11 +150,15 @@ function text_size(width, height, template) {
 }
 
 var svg_el = (function(){
+	//Prevent IE <9 from initializing SVG renderer
+	if(!window.XMLSerializer) return;
 	var serializer = new XMLSerializer();
 	var svg_ns = "http://www.w3.org/2000/svg"
 	var svg = document.createElementNS(svg_ns, "svg");
-	svg.setAttribute("xmlns", "http://www.w3.org/2000/svg")
-	svg.setAttribute("xmlns:xlink", "http://www.w3.org/1999/xlink");
+	//IE throws an exception if this is set and Chrome requires it to be set
+	if(svg.webkitMatchesSelector){
+		svg.setAttribute("xmlns", "http://www.w3.org/2000/svg")
+	}
 	var bg_el = document.createElementNS(svg_ns, "rect")
 	var text_el = document.createElementNS(svg_ns, "text")
 	var textnode_el = document.createTextNode(null)
@@ -163,7 +166,7 @@ var svg_el = (function(){
 	text_el.appendChild(textnode_el)
 	svg.appendChild(bg_el)
 	svg.appendChild(text_el)
-		
+
 	return function(props){
 		svg.setAttribute("width",props.width);
 		svg.setAttribute("height", props.height);