From c8e95da745a92b4965b2c16f46da8310aeadf547 Mon Sep 17 00:00:00 2001
From: Friedel Ziegelmayer <dignifiedquire@gmail.com>
Date: Mon, 7 Nov 2016 13:52:21 +0100
Subject: [PATCH 1/2] fix(blockstore): do not end source before everything was
 emitted

---
 src/stores/blockstore.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/stores/blockstore.js b/src/stores/blockstore.js
index 69225c02..f321b542 100644
--- a/src/stores/blockstore.js
+++ b/src/stores/blockstore.js
@@ -123,15 +123,17 @@ exports.setUp = (basePath, BlobStore, locks) => {
       const source = (end, cb) => {
         if (end) {
           ended = end
-        }
-        if (ended) {
-          return cb(ended)
+          return cb(end)
         }
 
         if (written.length) {
           return cb(null, written.shift())
         }
 
+        if (ended) {
+          return cb(ended)
+        }
+
         push = cb
       }
 

From 2d8f47da692fd840089014616d35f6a1b4129e63 Mon Sep 17 00:00:00 2001
From: Friedel Ziegelmayer <dignifiedquire@gmail.com>
Date: Mon, 7 Nov 2016 13:53:54 +0100
Subject: [PATCH 2/2] chore(travis): update config

---
 .travis.yml | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fc1482fc..a152bd2c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,15 @@
 sudo: false
 language: node_js
-node_js:
-  - 4
-  - 6
-  - stable
+matrix:
+  include:
+  - node_js: 4
+    env: CXX=g++-4.8
+  - node_js: 6
+    env:
+      - SAUCE=true
+      - CXX=g++-4.8
+  - node_js: stable
+    env: CXX=g++-4.8
 
 # Make sure we have new NPM.
 before_install:
@@ -14,12 +20,17 @@ script:
   - npm test
   - npm run coverage
 
-addons:
-  firefox: 'latest'
-
 before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 
 after_success:
   - npm run coverage-publish
+
+addons:
+  firefox: 'latest'
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.8