Merge branch 'master' into derp

Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/javascript/dropdowns.md
	less/utilities.less

4 files changed, 8 insertions, 2 deletions

diff --git a/less/forms.less b/less/forms.less
index 86669b44e..62066f0a9 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -344,6 +344,7 @@ input[type="checkbox"] {
   height: @input-height-base;
   line-height: @input-height-base;
   text-align: center;
+  pointer-events: none;
 }
 .input-lg + .form-control-feedback {
   width: @input-height-large;
diff --git a/less/tables.less b/less/tables.less
index 38c7da349..25db1fe40 100644
--- a/less/tables.less
+++ b/less/tables.less
@@ -6,6 +6,12 @@
 table {
   background-color: @table-bg;
 }
+caption {
+  padding-top: @table-cell-padding;
+  padding-bottom: @table-cell-padding;
+  color: @text-muted;
+  text-align: left;
+}
 th {
   text-align: left;
 }
diff --git a/less/utilities.less b/less/utilities.less
index 083446c98..ce98e368c 100644
--- a/less/utilities.less
+++ b/less/utilities.less
@@ -49,5 +49,4 @@
 
 .affix {
   position: fixed;
-  transform: translate3d(0, 0, 0);
 }
diff --git a/less/variables.less b/less/variables.less
index 5a414b063..a12f37085 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -190,7 +190,7 @@
 @input-box-shadow-focus:         rgba(102,175,233,.6);
 
 //** Placeholder text color
-@input-color-placeholder:        @gray-light;
+@input-color-placeholder:        #999;
 
 //** Default `.form-control` height
 @input-height-base:              ((@font-size-base * @line-height-base) + (@padding-base-vertical * 2) + .2);