Merge branch '2.1.2-wip' into exploratory

Conflicts:
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache

docs/assets/css/bootstrap.css

@@ -3058,7 +3058,8 @@ button.close {
           border-radius: 5px;
 }
 
-.btn-large [class^="icon-"] {
+.btn-large [class^="icon-"],
+.btn-large [class*=" icon-"] {
   margin-top: 2px;
 }
 
@@ -3070,7 +3071,8 @@ button.close {
           border-radius: 3px;
 }
 
-.btn-small [class^="icon-"] {
+.btn-small [class^="icon-"],
+.btn-small [class*=" icon-"] {
   margin-top: 0;
 }