Merge branch 'SBoudrias-patch-1' into 3.0.0-wip

Conflicts:
	less/type.less

diff --cc less/type.less
index 54f18d1377ebbf416e07f4e2cf97e575d07375bc,54f5778c4ba667e4e8cece55b96c20f5c8031a9d..5305a0df6901cbb04863d641e20bbe2ed4911952
--- 1/less/type.less
--- 2/less/type.less
+++ b/less/type.less
@@@ -52,12 -56,12 +52,11 @@@ a.text-success:focus { color: darken(@s
  // Headings
  // -------------------------
  
 -h1, h2, h3, h4, h5, h6 {
 -  margin: (@baseLineHeight / 2) 0;
 -  font-family: @headingsFontFamily;
 -  font-weight: @headingsFontWeight;
 -  line-height: @baseLineHeight;
 -  color: @headingsColor;
 +h1, h2, h3, h4, h5, h6,
 +.h1, .h2, .h3, .h4, .h5, .h6 {
 +  font-family: @headings-font-family;
 +  font-weight: @headings-font-weight;
 +  line-height: @line-height-base;
-   text-rendering: optimizelegibility; // Fix the character spacing for headings
    small {
      font-weight: normal;
      line-height: 1;