Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
	docs/assets/css/bootstrap.css
	docs/templates/pages/base-css.mustache
	less/dropdowns.less
	less/forms.less

diff --cc docs/assets/css/bootstrap.css
index de8369d708eb559cb16e9eadecbdbbe144bcf8c0,785d989c15e59d1fda8330c5c310de296659849a..07f737734deaba48823db72144cb3ef69e012c51
--- 1/docs/assets/css/bootstrap.css
--- 2/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@@ -2352,11 -2936,11 +2352,11 @@@ table th[class*="span"] 
    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
  }
  
- .dropdown-menu .active > a,
- .dropdown-menu .active > a:hover {
+ .dropdown-menu > .active > a,
+ .dropdown-menu > .active > a:hover {
    color: #ffffff;
    text-decoration: none;
 -  background-color: #0081c2;
 +  background-color: #0077b3;
    background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
    background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);

diff --cc docs/assets/js/bootstrap-carousel.js
Simple merge

diff --cc docs/assets/js/bootstrap-collapse.js
Simple merge

diff --cc docs/assets/js/bootstrap.js
Simple merge

diff --cc js/bootstrap-carousel.js
Simple merge

diff --cc js/bootstrap-collapse.js
Simple merge

diff --cc less/dropdowns.less
index 93fb5e11cae6e51cfa12a3d2580984e4177ff7e8,a0d4b1fd0c14a4bad2740c01bf0f302af9dbc58f..312d632ced30935d29ee160cd36cc17b59f6f007
--- 1/less/dropdowns.less
--- 2/less/dropdowns.less
+++ b/less/dropdowns.less
@@@ -86,12 -95,12 +86,12 @@@
  
  // Active state
  // ------------
- .dropdown-menu .active > a,
- .dropdown-menu .active > a:hover {
+ .dropdown-menu > .active > a,
+ .dropdown-menu > .active > a:hover {
 -  color: @dropdownLinkColorActive;
 +  color: @dropdown-link-color-active;
    text-decoration: none;
    outline: 0;
 -  #gradient > .vertical(@dropdownLinkBackgroundActive, darken(@dropdownLinkBackgroundActive, 5%));
 +  #gradient > .vertical(@dropdown-link-background-active, darken(@dropdown-link-background-active, 5%));
  }
  
  // Disabled state