From 1f76bd1942b7332275ab4e847a12a51c6e9e988c Mon Sep 17 00:00:00 2001
From: Michael Teeuw <michael@xonaymedia.nl>
Date: Sun, 1 Jul 2018 21:01:41 +0200
Subject: [PATCH 1/3] Setup the next release (2.5.0).

---
 CHANGELOG.md      | 10 ++++++++++
 package-lock.json |  2 +-
 package.json      |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 527b9629..336d45e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,16 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ---
 
+## [2.5.0] - Unreleased
+
+*This release is scheduled to be released on 2018-10-01.*
+
+### Added
+
+### Fixed
+
+### Updated
+
 ## [2.4.0] - 2018-07-01
 
 ⚠️ **Warning:** This release includes an updated version of Electron. This requires a Raspberry Pi configuration change to allow the best performance and prevent the CPU from overheating. Please read the information on the [MagicMirror Wiki](https://github.com/michmich/magicmirror/wiki/configuring-the-raspberry-pi#enable-the-open-gl-driver-to-decrease-electrons-cpu-usage).
diff --git a/package-lock.json b/package-lock.json
index 8af095a9..3376a2e3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "magicmirror",
-  "version": "2.4.0",
+  "version": "2.5.0-dev",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 50b46886..2aae05eb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "magicmirror",
-  "version": "2.4.0",
+  "version": "2.5.0-dev",
   "description": "The open source modular smart mirror platform.",
   "main": "js/electron.js",
   "scripts": {

From dc3e960e792cfba3950c788f31618f1312bad0e3 Mon Sep 17 00:00:00 2001
From: Janne Kalliola <janne@exove.fi>
Date: Mon, 2 Jul 2018 23:22:09 +0300
Subject: [PATCH 2/3] Fixed parsing date, as dt_txt is missing from certain
 weather API results

---
 modules/default/weatherforecast/weatherforecast.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/default/weatherforecast/weatherforecast.js b/modules/default/weatherforecast/weatherforecast.js
index c16759ef..c06f5f5b 100644
--- a/modules/default/weatherforecast/weatherforecast.js
+++ b/modules/default/weatherforecast/weatherforecast.js
@@ -334,8 +334,15 @@ Module.register("weatherforecast",{
 			var forecast = data.list[i];
 			this.parserDataWeather(forecast); // hack issue #1017
 
-			var day = moment(forecast.dt_txt, "YYYY-MM-DD hh:mm:ss").format("ddd");
-			var hour = moment(forecast.dt_txt, "YYYY-MM-DD hh:mm:ss").format("H");
+			var day;
+			var hour;
+			if(!!forecast.dt_txt) {
+				day = moment(forecast.dt_txt, "YYYY-MM-DD hh:mm:ss").format("ddd");
+				hour = moment(forecast.dt_txt, "YYYY-MM-DD hh:mm:ss").format("H");
+			} else {
+				day = moment(forecast.dt, "X").format("ddd");
+				hour = moment(forecast.dt, "X").format("H");
+			}
 
 			if (day !== lastDay) {
 				var forecastData = {

From ef5ea93de13a7000aea161be8216541d993c98e1 Mon Sep 17 00:00:00 2001
From: Michael Teeuw <michael@xonaymedia.nl>
Date: Wed, 4 Jul 2018 11:20:37 +0200
Subject: [PATCH 3/3] Prepare for release 2.4.1

---
 CHANGELOG.md      | 8 ++------
 package-lock.json | 2 +-
 package.json      | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 336d45e1..3c242e50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,15 +5,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ---
 
-## [2.5.0] - Unreleased
-
-*This release is scheduled to be released on 2018-10-01.*
-
-### Added
+## [2.4.1] - 2018-07-04
 
 ### Fixed
 
-### Updated
+- Fix weather parsing issue #1332.
 
 ## [2.4.0] - 2018-07-01
 
diff --git a/package-lock.json b/package-lock.json
index 3376a2e3..6241a3d6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "magicmirror",
-  "version": "2.5.0-dev",
+  "version": "2.4.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2aae05eb..b220bee6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "magicmirror",
-  "version": "2.5.0-dev",
+  "version": "2.4.1",
   "description": "The open source modular smart mirror platform.",
   "main": "js/electron.js",
   "scripts": {