diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index e8ca60a6df..3097692de6 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 09688778b3..1391ad41ea 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -964,6 +964,13 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
 .form-inline .input-prepend .add-on {
   vertical-align: middle;
 }
+.form-search .radio,
+.form-inline .radio,
+.form-search .checkbox,
+.form-inline .checkbox {
+  margin-bottom: 0;
+  vertical-align: middle;
+}
 .control-group {
   margin-bottom: 9px;
 }
diff --git a/docs/base-css.html b/docs/base-css.html
index c0ad882a52..09614af2a4 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -907,7 +907,10 @@ For example, <code>section</code> should be wrapped as inline.
       <form class="well form-inline">
         <input type="text" class="input-small" placeholder="Email">
         <input type="password" class="input-small" placeholder="Password">
-        <button type="submit" class="btn">Go</button>
+        <label class="checkbox">
+          <input type="checkbox"> Remember?
+        </label>
+        <button type="submit" class="btn">Sign in</button>
       </form>
 <pre class="prettyprint linenums">
 &lt;form class="well form-inline"&gt;
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 750957beb7..5e20aae2c0 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -831,7 +831,10 @@
       <form class="well form-inline">
         <input type="text" class="input-small" placeholder="{{_i}}Email{{/i}}">
         <input type="password" class="input-small" placeholder="{{_i}}Password{{/i}}">
-        <button type="submit" class="btn">{{_i}}Go{{/i}}</button>
+        <label class="checkbox">
+          <input type="checkbox"> {{_i}}Remember?{{/i}}
+        </label>
+        <button type="submit" class="btn">{{_i}}Sign in{{/i}}</button>
       </form>
 <pre class="prettyprint linenums">
 &lt;form class="well form-inline"&gt;
diff --git a/less/forms.less b/less/forms.less
index 5fbb53c9ae..17393b2808 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -453,6 +453,14 @@ select:focus:required:invalid {
 .form-inline .input-prepend .add-on {
   vertical-align: middle;
 }
+// Inline checkbox/radio labels
+.form-search .radio,
+.form-inline .radio,
+.form-search .checkbox,
+.form-inline .checkbox {
+  margin-bottom: 0;
+  vertical-align: middle;
+}
 
 // Margin to space out fieldsets
 .control-group {