From 32c78878f95ad1f70e4a63256bba8c6e68703fbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotrek=20Reinmar=20Koszuli=C5=84ski?=
 <pkoszulinski@gmail.com>
Date: Wed, 8 Jan 2014 18:01:28 +0100
Subject: [PATCH 1/3] Use unitless line-heights.

---
 contents.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contents.css b/contents.css
index 0bc362c2966..ac3e9af2b96 100644
--- a/contents.css
+++ b/contents.css
@@ -21,7 +21,7 @@ body
 .cke_editable
 {
 	font-size: 13px;
-	line-height: 1.6em;
+	line-height: 1.6;
 }
 
 blockquote
@@ -64,7 +64,7 @@ ol,ul,dl
 h1,h2,h3,h4,h5,h6
 {
 	font-weight: normal;
-	line-height: 1.2em;
+	line-height: 1.2;
 }
 
 hr

From ed432e4795055c018b2bf54500c060698f39b7bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotrek=20Reinmar=20Koszuli=C5=84ski?=
 <pkoszulinski@gmail.com>
Date: Wed, 8 Jan 2014 18:33:20 +0100
Subject: [PATCH 2/3] Use unitless line-height for samples styling.

---
 samples/inlineall.html | 6 +++---
 samples/sample.css     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/inlineall.html b/samples/inlineall.html
index 48b8dbc4865..26234a01042 100644
--- a/samples/inlineall.html
+++ b/samples/inlineall.html
@@ -103,14 +103,14 @@
 		{
 			font-family: "Arial Black",arial-black;
 			font-size: 4.6em;
-			line-height: 1.1em;
+			line-height: 1.1;
 			text-transform: uppercase;
 		}
 
 		#headerLeft h3
 		{
 			font-size: 2.3em;
-			line-height: 1.1em;
+			line-height: 1.1;
 			margin: .2em 0 0;
 			color: #666;
 		}
@@ -123,7 +123,7 @@
 
 		#headerRight p
 		{
-			line-height: 1.8em;
+			line-height: 1.8;
 			text-align: justify;
 			margin: 0;
 		}
diff --git a/samples/sample.css b/samples/sample.css
index 6c9fc82d35a..f0686ea165f 100644
--- a/samples/sample.css
+++ b/samples/sample.css
@@ -5,7 +5,7 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
 
 html, body, h1, h2, h3, h4, h5, h6, div, span, blockquote, p, address, form, fieldset, img, ul, ol, dl, dt, dd, li, hr, table, td, th, strong, em, sup, sub, dfn, ins, del, q, cite, var, samp, code, kbd, tt, pre
 {
-	line-height: 1.5em;
+	line-height: 1.5;
 }
 
 body

From c283baca4d5003228602d383e4bea96626d664bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotrek=20Reinmar=20Koszuli=C5=84ski?=
 <pkoszulinski@gmail.com>
Date: Thu, 9 Jan 2014 11:41:41 +0100
Subject: [PATCH 3/3] Added changelog entry.

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 8581c1792dd..1966cae72c4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -22,6 +22,7 @@ CKEditor 4 Changelog
 * [#11186](http://dev.ckeditor.com/ticket/11186): Introduced the [`widgets.repository.addUpcastCallback`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-addUpcastCallback) method which allows to block upcasting given element to a widget.
 * [#11307](http://dev.ckeditor.com/ticket/11307): Fixed: Paste as plain text conflict with the [MooTools](http://mootools.net) library.
 * [#11140](http://dev.ckeditor.com/ticket/11140): [IE11] Fixed: Anchors are not draggable.
+* [#11379](http://dev.ckeditor.com/ticket/11379): Changed default contents' `line-height` to unitless values to avoid huge text overlapping (like in [#9696](http://dev.ckeditor.com/ticket/9696)).
 
 
 ## CKEditor 4.3.1