diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 4a90bab808..82d184fdcb 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 7e39e62a17..825c764f3c 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -992,6 +992,7 @@ select:focus:required:invalid:focus {
 .input-append select,
 .input-prepend .uneditable-input,
 .input-append .uneditable-input {
+  margin-bottom: 0;
   *margin-left: 0;
   -webkit-border-radius: 0 3px 3px 0;
   -moz-border-radius: 0 3px 3px 0;
diff --git a/docs/base-css.html b/docs/base-css.html
index d44b658913..76b13b7836 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1639,8 +1639,7 @@ For example, <code>section</code> should be wrapped as inline.
           <label class="control-label" for="inputIcon">Email address</label>
           <div class="controls">
             <div class="input-prepend">
-              <span class="add-on"><i class="icon-envelope"></i></span>
-              <input class="span2" id="inputIcon" type="text">
+              <span class="add-on"><i class="icon-envelope"></i></span><input class="span2" id="inputIcon" type="text">
             </div>
           </div>
         </div>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 9b2964d740..b463462bc2 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1563,8 +1563,7 @@
           <label class="control-label" for="inputIcon">{{_i}}Email address{{/i}}</label>
           <div class="controls">
             <div class="input-prepend">
-              <span class="add-on"><i class="icon-envelope"></i></span>
-              <input class="span2" id="inputIcon" type="text">
+              <span class="add-on"><i class="icon-envelope"></i></span><input class="span2" id="inputIcon" type="text">
             </div>
           </div>
         </div>
diff --git a/less/forms.less b/less/forms.less
index 8d9c253083..a53b273b90 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -365,6 +365,7 @@ select:focus:required:invalid {
   input,
   select,
   .uneditable-input {
+    margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
     *margin-left: 0;
     .border-radius(0 3px 3px 0);
     &:focus {