Merge branch 'master' of github.com:twbs/bootstrap

3 files changed, 6 insertions, 11 deletions

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a01c8c0e4..304a983d2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -174,6 +174,7 @@ license your work under the terms of the [MIT License](LICENSE.md).
 - Series of classes for a component should include a base class (e.g., `.component`) and use the base class as a prefix for modifier and sub-components (e.g., `.component-lg`).
 - Avoid inheritance and over nesting—use single, explicit classes whenever possible.
 - When feasible, default color palettes should comply with [WCAG color contrast guidelines](http://www.w3.org/TR/WCAG20/#visual-audio-contrast).
+- Except in rare cases, don't remove default `:focus` styles (via e.g. `outline: none;`) without providing alternative styles. See [this A11Y Project post](http://a11yproject.com/posts/never-remove-css-outlines/) for more details.
 
 ### JS
 
diff --git a/browserstack.json b/browserstack.json
index beab742e1..6ca781e5f 100644
--- a/browserstack.json
+++ b/browserstack.json
@@ -17,12 +17,6 @@
       "os_version": "Mavericks"
     },
     {
-      "browser": "chrome",
-      "browser_version": "latest",
-      "os": "OS X",
-      "os_version": "Mavericks"
-    },
-    {
       "browser": "firefox",
       "browser_version": "latest",
       "os": "Windows",
diff --git a/test-infra/sauce_browsers.yml b/test-infra/sauce_browsers.yml
index 9ec9c4cb1..4c1e011d3 100644
--- a/test-infra/sauce_browsers.yml
+++ b/test-infra/sauce_browsers.yml
@@ -5,11 +5,11 @@
     browserName: "safari",
     platform: "OS X 10.9"
   },
-  {
-    browserName: "chrome",
-    platform: "OS X 10.9",
-    version: "31"
-  },
+  # {
+  #   browserName: "chrome",
+  #   platform: "OS X 10.9",
+  #   version: "31"
+  # },
   {
     browserName: "firefox",
     platform: "OS X 10.9"