From bfe6c20e184559b0ce92d394b1b53f8398157012 Mon Sep 17 00:00:00 2001
From: Jonathan Neal <jonathantneal@hotmail.com>
Date: Thu, 30 Jun 2016 01:36:25 -0400
Subject: [PATCH] 4.2.0

---
 CHANGELOG.md | 10 ++++++++--
 package.json |  6 +++---
 test.html    |  6 +++++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66d146f..2fde0d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changes to normalize.css
 
+### 4.2.0 (April 12, 2016)
+
+* Correct the `line-height` in all browsers.
+* Restore `optgroup` font inheritance.
+* Update normalize.css heading.
+
 ### 4.1.1 (April 12, 2016)
 
 * Update normalize.css heading.
@@ -14,8 +20,8 @@
 * Restore `main` to package.json.
 * Restore proper overflow to certain `select` elements.
 * Remove opinionated cursor styles on buttons.
-* Update stylelint configuration
-* Update tests
+* Update stylelint configuration.
+* Update tests.
 
 ### 4.0.0 (March 19, 2016)
 
diff --git a/package.json b/package.json
index 37fa27c..786522e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "normalize.css",
-  "version": "4.1.1",
+  "version": "4.2.0",
   "description": "A modern alternative to CSS resets",
   "main": "normalize.css",
   "style": "normalize.css",
@@ -9,8 +9,8 @@
     "normalize.css"
   ],
   "devDependencies": {
-    "stylelint": "^5.4.0",
-    "stylelint-config-standard": "^5.0.0"
+    "stylelint": "^6.7.1",
+    "stylelint-config-standard": "^9.0.0"
   },
   "scripts": {
     "test": "stylelint normalize.css"
diff --git a/test.html b/test.html
index f4d47ee..b868836 100644
--- a/test.html
+++ b/test.html
@@ -3,7 +3,7 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 <title>Normalize CSS: UI tests</title>
-<script src="https://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+<script src="https://rawgit.com/aFarkas/html5shiv/gh-pages/dist/html5shiv.min.js"></script>
 <link rel="stylesheet" href="normalize.css">
 <style>
   /*! suit-test v0.1.0 | MIT License | github.com/suitcss */
@@ -90,6 +90,10 @@
   <div class="Test-run">
     abcdefghijklmnopqrstuvwxyz
   </div>
+  <h3 class="Test-it">should have a line height of 1.15</h3>
+  <div class="Test-run">
+    abcdefghijklmnopqrstuvwxyz
+  </div>
 
   <h2 class="Test-describe"><code>body</code></h2>
   <h3 class="Test-it">should have no margin (opinionated)</h3>