Merge branch '2.2.2-wip' into exploratory

Conflicts:
	docs/assets/css/bootstrap.css
	less/type.less

diff --cc docs/assets/css/bootstrap.css
index 2860d33002ab7bb4da07baa28ad832b38ee7710e,a5a1ca4a334c49af1640b0353fce58beb9319b44..61b2b03a7ed6df892bb50e81012a0c7e77b1bca7
--- 1/docs/assets/css/bootstrap.css
--- 2/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@@ -544,12 -808,15 +544,9 @@@ li 
    line-height: 20px;
  }
  
- .list-unstyled {
 -ul.unstyled,
 -ol.unstyled {
--  margin-left: 0;
--  list-style: none;
--}
--
 -ul.inline,
 -ol.inline {
++.list-unstyled,
 +.list-inline {
+   margin-left: 0;
    list-style: none;
  }
  

diff --cc less/type.less
index eded998fb2bf95656ff59f81701cdb3fd637cdba,683a30772614fba24b221439ea45dc959bfd346d..ec1c40ed77be2150f9a2dddd9b9bffe4826a337b
--- 1/less/type.less
--- 2/less/type.less
+++ b/less/type.less
@@@ -106,20 -107,23 +106,19 @@@ li 
    line-height: @baseLineHeight;
  }
  
--// Remove default list styles
- .list-unstyled {
 -ul.unstyled,
 -ol.unstyled {
++// List options
++// Unstyled keeps list items block level, just removes list-style
++.list-unstyled,
++// Inline turns list items into inline-block
++.list-inline {
    margin-left: 0;
    list-style: none;
  }
--
  // Single-line list items
- .list-inline {
 -ul.inline,
 -ol.inline {
 -  margin-left: 0;
--  list-style: none;
--  & > li {
--    display: inline-block;
--    padding-left: 5px;
--    padding-right: 5px;
--  }
++.list-inline > li {
++  display: inline-block;
++  padding-left: 5px;
++  padding-right: 5px;
  }
  
  // Description Lists