diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 84215f7264..4a66cd1bb1 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 47d25b0e8e..f1ab51a219 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -168,6 +168,16 @@
     width: auto;
     margin: 0;
   }
+  input,
+  textarea,
+  select,
+  .uneditable-input {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -ms-box-sizing: border-box;
+    box-sizing: border-box;
+    max-width: 100%;
+  }
 }
 @media (min-width: 768px) and (max-width: 979px) {
   .row {
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index dbab904076..2fd7cc135c 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3678,6 +3678,7 @@ a.thumbnail:hover {
   box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
+  -ms-box-sizing: border-box;
   box-sizing: border-box;
   -webkit-transition: width 0.6s ease;
   -moz-transition: width 0.6s ease;
diff --git a/less/mixins.less b/less/mixins.less
index 5ff58a5c96..e142f1a633 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -252,6 +252,7 @@
 .box-sizing(@boxmodel) {
   -webkit-box-sizing: @boxmodel;
      -moz-box-sizing: @boxmodel;
+      -ms-box-sizing: @boxmodel;
           box-sizing: @boxmodel;
 }
 
diff --git a/less/responsive.less b/less/responsive.less
index f321891e81..0003cd6d04 100644
--- a/less/responsive.less
+++ b/less/responsive.less
@@ -188,6 +188,17 @@
     width: auto;
     margin: 0;
   }
+
+  // FORM FIELDS
+  // -----------
+  // Make them behave like divs
+  input,
+  textarea,
+  select,
+  .uneditable-input {
+    .box-sizing(border-box);
+    max-width: 100%;
+  }
 }