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

Conflicts:
	less/dropdowns.less

diff --cc less/dropdowns.less
index 02d4a87baf176176dc0c0cb3c4de8830f5a95eda,e30144527a1be8b0773e9c110fd3999659f8badb..601210d7ff63fd79f63bc01eec7af891c51670b3
--- 1/less/dropdowns.less
--- 2/less/dropdowns.less
+++ b/less/dropdowns.less
@@@ -69,9 -77,9 +69,8 @@@
      padding: 3px 20px;
      clear: both;
      font-weight: normal;
 -    line-height: @baseLineHeight;
 -    color: @dropdownLinkColor;
 -    white-space: normal;
 +    line-height: @line-height-base;
 +    color: @dropdown-link-color;
-     white-space: nowrap;
    }
  }