From b2ee2d444282fcb90abfd43fe562253c73e14b08 Mon Sep 17 00:00:00 2001
From: Brian Schemp <bschemp@gmail.com>
Date: Thu, 18 Aug 2016 17:14:33 -1000
Subject: [PATCH] Fixed parseZone without timezone returning unexpected result

---
 src/lib/units/offset.js  |  8 +++++++-
 src/test/moment/zones.js | 10 ++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/lib/units/offset.js b/src/lib/units/offset.js
index 22305d17e..71d3954bf 100644
--- a/src/lib/units/offset.js
+++ b/src/lib/units/offset.js
@@ -164,7 +164,13 @@ export function setOffsetToParsedOffset () {
     if (this._tzm) {
         this.utcOffset(this._tzm);
     } else if (typeof this._i === 'string') {
-        this.utcOffset(offsetFromString(matchOffset, this._i));
+        var tZone = offsetFromString(matchOffset, this._i);
+
+        if (tZone === 0) {
+            this.utcOffset(0, true);
+        } else {
+            this.utcOffset(offsetFromString(matchOffset, this._i));
+        }
     }
     return this;
 }
diff --git a/src/test/moment/zones.js b/src/test/moment/zones.js
index 11ede1184..257a25822 100644
--- a/src/test/moment/zones.js
+++ b/src/test/moment/zones.js
@@ -458,3 +458,13 @@ test('timezone format', function (assert) {
     assert.equal(moment().zone(+90).format('ZZ'), '-0130', '+90 -> -0130');
     assert.equal(moment().zone(+120).format('ZZ'), '-0200', '+120 -> -0200');
 });
+
+test('parse zone without a timezone', function (assert) {
+    test.expectedDeprecations();
+    var m = moment.parseZone('2016-02-01T00:00:00');
+    assert.equal(
+        m.format('M D YYYY HH:mm:ss ZZ'),
+        '2 1 2016 00:00:00 +0000',
+        'Not providing a timezone should keep the time and change the zone to 0'
+    );
+});
-- 
2.47.2