From b4a298e1a3d5ad5ede0c1e5bd094c8f867cd6895 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Mon, 19 Dec 2016 12:25:35 -0800
Subject: [PATCH 1/4] inpage - temporarily disable ping stream

---
 app/scripts/inpage.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js
index ef199946c..7d43bd20e 100644
--- a/app/scripts/inpage.js
+++ b/app/scripts/inpage.js
@@ -2,8 +2,8 @@
 cleanContextForImports()
 require('web3/dist/web3.min.js')
 const LocalMessageDuplexStream = require('post-message-stream')
-const PingStream = require('ping-pong-stream/ping')
-const endOfStream = require('end-of-stream')
+// const PingStream = require('ping-pong-stream/ping')
+// const endOfStream = require('end-of-stream')
 const setupDappAutoReload = require('./lib/auto-reload.js')
 const MetamaskInpageProvider = require('./lib/inpage-provider.js')
 restoreContextAfterImports()
@@ -40,13 +40,14 @@ reloadStream.once('data', triggerReload)
 
 // setup ping timeout autoreload
 // LocalMessageDuplexStream does not self-close, so reload if pingStream fails
-var pingChannel = inpageProvider.multiStream.createStream('pingpong')
-var pingStream = new PingStream({ objectMode: true })
+// var pingChannel = inpageProvider.multiStream.createStream('pingpong')
+// var pingStream = new PingStream({ objectMode: true })
 // wait for first successful reponse
-metamaskStream.once('data', function(){
-  pingStream.pipe(pingChannel).pipe(pingStream)
-})
-endOfStream(pingStream, triggerReload)
+// disable pingStream until https://github.com/MetaMask/metamask-plugin/issues/746 is resolved more gracefully
+// metamaskStream.once('data', function(){
+//   pingStream.pipe(pingChannel).pipe(pingStream)
+// })
+// endOfStream(pingStream, triggerReload)
 
 // set web3 defaultAcount
 inpageProvider.publicConfigStore.subscribe(function (state) {

From 6f8370fce833cd6a79b9da6f9259f707c8037d4f Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Mon, 19 Dec 2016 13:22:02 -0800
Subject: [PATCH 2/4] changelog - add note on inf reload detection hotfix

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a74ecd01c..0b9e2c930 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Current Master
 
-- Fix broken reload detection.
+- Temporarily disable extension reload detection causing infinite reload bug.
 - Fix transaction forever cached-as-pending bug.
 - Removed Morden testnet provider from provider menu.
 

From 5ea7d738d2d526be3784198360be0bf854e132fc Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Mon, 19 Dec 2016 13:23:32 -0800
Subject: [PATCH 3/4] changelog - inf reload detection hotfix

---
 CHANGELOG.md      | 8 +++++---
 app/manifest.json | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b9e2c930..cf555173a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,14 +3,16 @@
 ## Current Master
 
 - Temporarily disable extension reload detection causing infinite reload bug.
-- Fix transaction forever cached-as-pending bug.
+## 2.14.0 2016-12-16
+
 - Removed Morden testnet provider from provider menu.
+- Add support for notices.
+- Fix broken reload detection.
+- Fix transaction forever cached-as-pending bug.
 
 ## 2.13.11 2016-11-23
 
 - Add support for synchronous RPC method "eth_uninstallFilter".
-- Add support for notices.
-- Add support for working links.
 
 ## 2.13.10 2016-11-22
 
diff --git a/app/manifest.json b/app/manifest.json
index 5cd80242f..f53c3b8b1 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "MetaMask",
   "short_name": "Metamask",
-  "version": "2.13.11",
+  "version": "2.14.0",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "Ethereum Browser Extension",

From e1d6a1ea9440871b721ab921ce7e1a69b108f82e Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Mon, 19 Dec 2016 13:24:38 -0800
Subject: [PATCH 4/4] changelog - add whitespace

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf555173a..0fd1e83bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Current Master
 
 - Temporarily disable extension reload detection causing infinite reload bug.
+
 ## 2.14.0 2016-12-16
 
 - Removed Morden testnet provider from provider menu.