From 313bff7affbe76340635ebcfd2d29277a2d1b603 Mon Sep 17 00:00:00 2001
From: Marc Jansen <jansen@terrestris.de>
Date: Fri, 9 Oct 2015 16:07:46 +0200
Subject: [PATCH 1/3] Merge pull request #4242 from
 marcjansen/fix-drawtext-regression

Fix a drawText regression introduced with 31a68e2
---
 src/ol/render/canvas/canvasreplay.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/ol/render/canvas/canvasreplay.js b/src/ol/render/canvas/canvasreplay.js
index d5cd9b7035..3c3f091b85 100644
--- a/src/ol/render/canvas/canvasreplay.js
+++ b/src/ol/render/canvas/canvasreplay.js
@@ -1560,10 +1560,8 @@ goog.inherits(ol.render.canvas.TextReplay, ol.render.canvas.Replay);
  */
 ol.render.canvas.TextReplay.prototype.drawText =
     function(flatCoordinates, offset, end, stride, geometry, feature) {
-  if (this.text_ === '' ||
-      !this.textState_ ||
-      (this.textFillState_ &&
-       !this.textStrokeState_)) {
+  if (this.text_ === '' || !this.textState_ ||
+      (!this.textFillState_ && !this.textStrokeState_)) {
     return;
   }
   if (this.textFillState_) {

From 1941be9995bc07b5ea5230db2e74489ab92e271a Mon Sep 17 00:00:00 2001
From: Andreas Hocevar <andreas.hocevar@gmail.com>
Date: Fri, 9 Oct 2015 17:37:52 +0200
Subject: [PATCH 2/3] Changelog for v3.10.1

---
 changelog/v3.10.1.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 changelog/v3.10.1.md

diff --git a/changelog/v3.10.1.md b/changelog/v3.10.1.md
new file mode 100644
index 0000000000..c64d46904a
--- /dev/null
+++ b/changelog/v3.10.1.md
@@ -0,0 +1,7 @@
+# v3.10.1
+
+## Summary
+
+This is a patch release that fixes a regression causing text styles with a fill but no stroke to not be rendered.
+
+ * [#4242](https://github.com/openlayers/ol3/pull/4242) - Fix a drawText regression introduced with 31a68e2 ([@marcjansen](https://github.com/marcjansen))

From db0c8c3c3a3083525fd8e82d9e2755ad38d81bf0 Mon Sep 17 00:00:00 2001
From: Andreas Hocevar <andreas.hocevar@gmail.com>
Date: Fri, 9 Oct 2015 17:38:41 +0200
Subject: [PATCH 3/3] Update package version to 3.10.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 816178fa6a..a4c41cd0f8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openlayers",
-  "version": "3.10.0",
+  "version": "3.10.1",
   "description": "Build tools and sources for developing OpenLayers based mapping applications",
   "keywords": [
     "map",