diff --git a/.travis.yml b/.travis.yml
index def02f229..27a52383c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,259 +27,384 @@ sudo: required
 jobs:
   include:
 
-  ###
-  # Stage: ('Build dependencies', 'BuildDep')
-  ###
+    ###
+    # Stage: Build dependencies
+    ###
 
-  # ubuntu-16.10
-  - stage: Build dependencies
-    os: linux
-    compiler: gcc
-    env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=ubuntu-16.10
-    install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
-      travis/install_linux.sh
-    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
-      travis/postsubmit.sh DefaultDebug BuildDep
-    before_cache:
-      docker cp storm:/storm/. .
-  - stage: Build dependencies
-    os: linux
-    compiler: gcc
-    env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=ubuntu-16.10
-    install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
-      travis/install_linux.sh
-    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
-      travis/postsubmit.sh DefaultRelease BuildDep
-    before_cache:
-      docker cp storm:/storm/. .
-  # debian-9
-  - stage: Build dependencies
-    os: linux
-    compiler: gcc
-    env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=debian-9
-    install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
-      travis/install_linux.sh
-    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
-      travis/postsubmit.sh DefaultDebug BuildDep
-    before_cache:
-      docker cp storm:/storm/. .
-  - stage: Build dependencies
-    os: linux
-    compiler: gcc
-    env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=debian-9
-    install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
-      travis/install_linux.sh
-    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
-      travis/postsubmit.sh DefaultRelease BuildDep
-    before_cache:
-      docker cp storm:/storm/. .
-  # osx
-  - stage: Build dependencies
-    os: osx
-    compiler: clang
-    env: BUILD=DefaultDebug COMPILER=clang-4.0 STL=libc++
-    install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-      travis/install_osx.sh
-    script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-      travis/postsubmit.sh DefaultDebug BuildDep
-  - stage: Build dependencies
-    os: osx
-    compiler: clang
-    env: BUILD=DefaultRelease COMPILER=clang-4.0 STL=libc++
-    install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-      travis/install_osx.sh
-    script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-      travis/postsubmit.sh DefaultRelease BuildDep
+    # ubuntu-16.10
+    - stage: Build dependencies
+      os: linux
+      compiler: gcc
+      env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=ubuntu-16.10
+      install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+        travis/install_linux.sh
+      script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+        travis/postsubmit.sh DefaultDebug BuildDep
+      before_cache:
+        docker cp storm:/storm/. .
+    - stage: Build dependencies
+      os: linux
+      compiler: gcc
+      env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=ubuntu-16.10
+      install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+        travis/install_linux.sh
+      script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+        travis/postsubmit.sh DefaultRelease BuildDep
+      before_cache:
+        docker cp storm:/storm/. .
+    # debian-9
+    - stage: Build dependencies
+      os: linux
+      compiler: gcc
+      env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=debian-9
+      install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+        travis/install_linux.sh
+      script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+        travis/postsubmit.sh DefaultDebug BuildDep
+      before_cache:
+        docker cp storm:/storm/. .
+    - stage: Build dependencies
+      os: linux
+      compiler: gcc
+      env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=debian-9
+      install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+        travis/install_linux.sh
+      script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+        travis/postsubmit.sh DefaultRelease BuildDep
+      before_cache:
+        docker cp storm:/storm/. .
+    # osx
+    - stage: Build dependencies
+      os: osx
+      compiler: clang
+      env: BUILD=DefaultDebug COMPILER=clang-4.0 STL=libc++
+      install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/install_osx.sh
+      script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/postsubmit.sh DefaultDebug BuildDep
+    - stage: Build dependencies
+      os: osx
+      compiler: clang
+      env: BUILD=DefaultRelease COMPILER=clang-4.0 STL=libc++
+      install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/install_osx.sh
+      script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/postsubmit.sh DefaultRelease BuildDep
 
-  ###
-  # Stage: ('Build library', 'BuildLib')
-  ###
+    ###
+    # Stage: Build library 1
+    ###
 
-  # ubuntu-16.10
-  - stage: Build library
-    os: linux
-    compiler: gcc
-    env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=ubuntu-16.10
-    install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
-      travis/install_linux.sh
-    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
-      travis/postsubmit.sh DefaultDebug BuildLib
-    before_cache:
-      docker cp storm:/storm/. .
-  - stage: Build library
-    os: linux
-    compiler: gcc
-    env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=ubuntu-16.10
-    install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
-      travis/install_linux.sh
-    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
-      travis/postsubmit.sh DefaultRelease BuildLib
-    before_cache:
-      docker cp storm:/storm/. .
-  # debian-9
-  - stage: Build library
-    os: linux
-    compiler: gcc
-    env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=debian-9
-    install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
-      travis/install_linux.sh
-    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
-      travis/postsubmit.sh DefaultDebug BuildLib
-    before_cache:
-      docker cp storm:/storm/. .
-  - stage: Build library
-    os: linux
-    compiler: gcc
-    env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=debian-9
-    install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
-      travis/install_linux.sh
-    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
-      travis/postsubmit.sh DefaultRelease BuildLib
-    before_cache:
-      docker cp storm:/storm/. .
-  # osx
-  - stage: Build library
-    os: osx
-    compiler: clang
-    env: BUILD=DefaultDebug COMPILER=clang-4.0 STL=libc++
-    install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-      travis/install_osx.sh
-    script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-      travis/postsubmit.sh DefaultDebug BuildLib
-  - stage: Build library
-    os: osx
-    compiler: clang
-    env: BUILD=DefaultRelease COMPILER=clang-4.0 STL=libc++
-    install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-      travis/install_osx.sh
-    script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-      travis/postsubmit.sh DefaultRelease BuildLib
+    # ubuntu-16.10
+    - stage: Build library 1
+      os: linux
+      compiler: gcc
+      env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=ubuntu-16.10
+      install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+        travis/install_linux.sh
+      script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+        travis/postsubmit.sh DefaultDebug BuildLib
+      before_cache:
+        docker cp storm:/storm/. .
+    - stage: Build library 1
+      os: linux
+      compiler: gcc
+      env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=ubuntu-16.10
+      install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+        travis/install_linux.sh
+      script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+        travis/postsubmit.sh DefaultRelease BuildLib
+      before_cache:
+        docker cp storm:/storm/. .
+    # debian-9
+    - stage: Build library 1
+      os: linux
+      compiler: gcc
+      env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=debian-9
+      install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+        travis/install_linux.sh
+      script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+        travis/postsubmit.sh DefaultDebug BuildLib
+      before_cache:
+        docker cp storm:/storm/. .
+    - stage: Build library 1
+      os: linux
+      compiler: gcc
+      env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=debian-9
+      install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+        travis/install_linux.sh
+      script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+        travis/postsubmit.sh DefaultRelease BuildLib
+      before_cache:
+        docker cp storm:/storm/. .
+    # osx
+    - stage: Build library 1
+      os: osx
+      compiler: clang
+      env: BUILD=DefaultDebug COMPILER=clang-4.0 STL=libc++
+      install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/install_osx.sh
+      script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/postsubmit.sh DefaultDebug BuildLib
+    - stage: Build library 1
+      os: osx
+      compiler: clang
+      env: BUILD=DefaultRelease COMPILER=clang-4.0 STL=libc++
+      install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/install_osx.sh
+      script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/postsubmit.sh DefaultRelease BuildLib
 
-  ###
-  # Stage: ('Build all', 'BuildAll')
-  ###
+    ###
+    # Stage: Build library 2
+    ###
 
-  # ubuntu-16.10
-  - stage: Build all
-    os: linux
-    compiler: gcc
-    env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=ubuntu-16.10
-    install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
-      travis/install_linux.sh
-    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
-      travis/postsubmit.sh DefaultDebug BuildAll
-    before_cache:
-      docker cp storm:/storm/. .
-  - stage: Build all
-    os: linux
-    compiler: gcc
-    env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=ubuntu-16.10
-    install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
-      travis/install_linux.sh
-    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
-      travis/postsubmit.sh DefaultRelease BuildAll
-    before_cache:
-      docker cp storm:/storm/. .
-  # debian-9
-  - stage: Build all
-    os: linux
-    compiler: gcc
-    env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=debian-9
-    install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
-      travis/install_linux.sh
-    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
-      travis/postsubmit.sh DefaultDebug BuildAll
-    before_cache:
-      docker cp storm:/storm/. .
-  - stage: Build all
-    os: linux
-    compiler: gcc
-    env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=debian-9
-    install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
-      travis/install_linux.sh
-    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
-      travis/postsubmit.sh DefaultRelease BuildAll
-    before_cache:
-      docker cp storm:/storm/. .
-  # osx
-  - stage: Build all
-    os: osx
-    compiler: clang
-    env: BUILD=DefaultDebug COMPILER=clang-4.0 STL=libc++
-    install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-      travis/install_osx.sh
-    script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-      travis/postsubmit.sh DefaultDebug BuildAll
-  - stage: Build all
-    os: osx
-    compiler: clang
-    env: BUILD=DefaultRelease COMPILER=clang-4.0 STL=libc++
-    install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-      travis/install_osx.sh
-    script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-      travis/postsubmit.sh DefaultRelease BuildAll
+    # ubuntu-16.10
+    - stage: Build library 2
+      os: linux
+      compiler: gcc
+      env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=ubuntu-16.10
+      install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+        travis/install_linux.sh
+      script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+        travis/postsubmit.sh DefaultDebug BuildLib
+      before_cache:
+        docker cp storm:/storm/. .
+    - stage: Build library 2
+      os: linux
+      compiler: gcc
+      env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=ubuntu-16.10
+      install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+        travis/install_linux.sh
+      script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+        travis/postsubmit.sh DefaultRelease BuildLib
+      before_cache:
+        docker cp storm:/storm/. .
+    # debian-9
+    - stage: Build library 2
+      os: linux
+      compiler: gcc
+      env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=debian-9
+      install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+        travis/install_linux.sh
+      script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+        travis/postsubmit.sh DefaultDebug BuildLib
+      before_cache:
+        docker cp storm:/storm/. .
+    - stage: Build library 2
+      os: linux
+      compiler: gcc
+      env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=debian-9
+      install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+        travis/install_linux.sh
+      script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+        travis/postsubmit.sh DefaultRelease BuildLib
+      before_cache:
+        docker cp storm:/storm/. .
+    # osx
+    - stage: Build library 2
+      os: osx
+      compiler: clang
+      env: BUILD=DefaultDebug COMPILER=clang-4.0 STL=libc++
+      install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/install_osx.sh
+      script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/postsubmit.sh DefaultDebug BuildLib
+    - stage: Build library 2
+      os: osx
+      compiler: clang
+      env: BUILD=DefaultRelease COMPILER=clang-4.0 STL=libc++
+      install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/install_osx.sh
+      script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/postsubmit.sh DefaultRelease BuildLib
 
-  ###
-  # Stage: ('Test all', 'TestAll')
-  ###
+    ###
+    # Stage: Build all
+    ###
 
-  # ubuntu-16.10
-  - stage: Test all
-    os: linux
-    compiler: gcc
-    env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=ubuntu-16.10
-    install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
-      travis/install_linux.sh
-    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
-      travis/postsubmit.sh DefaultDebug TestAll
-    before_cache:
-      docker cp storm:/storm/. .
-  - stage: Test all
-    os: linux
-    compiler: gcc
-    env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=ubuntu-16.10
-    install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
-      travis/install_linux.sh
-    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
-      travis/postsubmit.sh DefaultRelease TestAll
-    before_cache:
-      docker cp storm:/storm/. .
-  # debian-9
-  - stage: Test all
-    os: linux
-    compiler: gcc
-    env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=debian-9
-    install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
-      travis/install_linux.sh
-    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
-      travis/postsubmit.sh DefaultDebug TestAll
-    before_cache:
-      docker cp storm:/storm/. .
-  - stage: Test all
-    os: linux
-    compiler: gcc
-    env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=debian-9
-    install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
-      travis/install_linux.sh
-    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
-      travis/postsubmit.sh DefaultRelease TestAll
-    before_cache:
-      docker cp storm:/storm/. .
-  # osx
-  - stage: Test all
-    os: osx
-    compiler: clang
-    env: BUILD=DefaultDebug COMPILER=clang-4.0 STL=libc++
-    install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-      travis/install_osx.sh
-    script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-      travis/postsubmit.sh DefaultDebug TestAll
-  - stage: Test all
-    os: osx
-    compiler: clang
-    env: BUILD=DefaultRelease COMPILER=clang-4.0 STL=libc++
-    install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-      travis/install_osx.sh
-    script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-      travis/postsubmit.sh DefaultRelease TestAll
+    # ubuntu-16.10
+    - stage: Build all
+      os: linux
+      compiler: gcc
+      env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=ubuntu-16.10
+      install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+        travis/install_linux.sh
+      script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+        travis/postsubmit.sh DefaultDebug BuildAll
+      before_cache:
+        docker cp storm:/storm/. .
+    - stage: Build all
+      os: linux
+      compiler: gcc
+      env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=ubuntu-16.10
+      install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+        travis/install_linux.sh
+      script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+        travis/postsubmit.sh DefaultRelease BuildAll
+      before_cache:
+        docker cp storm:/storm/. .
+    # debian-9
+    - stage: Build all
+      os: linux
+      compiler: gcc
+      env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=debian-9
+      install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+        travis/install_linux.sh
+      script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+        travis/postsubmit.sh DefaultDebug BuildAll
+      before_cache:
+        docker cp storm:/storm/. .
+    - stage: Build all
+      os: linux
+      compiler: gcc
+      env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=debian-9
+      install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+        travis/install_linux.sh
+      script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+        travis/postsubmit.sh DefaultRelease BuildAll
+      before_cache:
+        docker cp storm:/storm/. .
+    # osx
+    - stage: Build all
+      os: osx
+      compiler: clang
+      env: BUILD=DefaultDebug COMPILER=clang-4.0 STL=libc++
+      install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/install_osx.sh
+      script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/postsubmit.sh DefaultDebug BuildAll
+    - stage: Build all
+      os: osx
+      compiler: clang
+      env: BUILD=DefaultRelease COMPILER=clang-4.0 STL=libc++
+      install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/install_osx.sh
+      script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/postsubmit.sh DefaultRelease BuildAll
+
+    ###
+    # Stage: Test all
+    ###
+
+    # ubuntu-16.10
+    - stage: Test all
+      os: linux
+      compiler: gcc
+      env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=ubuntu-16.10
+      install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+        travis/install_linux.sh
+      script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+        travis/postsubmit.sh DefaultDebug TestAll
+      before_cache:
+        docker cp storm:/storm/. .
+    - stage: Test all
+      os: linux
+      compiler: gcc
+      env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=ubuntu-16.10
+      install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+        travis/install_linux.sh
+      script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+        travis/postsubmit.sh DefaultRelease TestAll
+      before_cache:
+        docker cp storm:/storm/. .
+    # debian-9
+    - stage: Test all
+      os: linux
+      compiler: gcc
+      env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=debian-9
+      install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+        travis/install_linux.sh
+      script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+        travis/postsubmit.sh DefaultDebug TestAll
+      before_cache:
+        docker cp storm:/storm/. .
+    - stage: Test all
+      os: linux
+      compiler: gcc
+      env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=debian-9
+      install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+        travis/install_linux.sh
+      script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+        travis/postsubmit.sh DefaultRelease TestAll
+      before_cache:
+        docker cp storm:/storm/. .
+    # osx
+    - stage: Test all
+      os: osx
+      compiler: clang
+      env: BUILD=DefaultDebug COMPILER=clang-4.0 STL=libc++
+      install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/install_osx.sh
+      script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/postsubmit.sh DefaultDebug TestAll
+    - stage: Test all
+      os: osx
+      compiler: clang
+      env: BUILD=DefaultRelease COMPILER=clang-4.0 STL=libc++
+      install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/install_osx.sh
+      script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/postsubmit.sh DefaultRelease TestAll
+
+  #
+  # Allowed failures
+  #
+  allow_failures:
+    - stage: Build library 1
+      os: linux
+      compiler: gcc
+      env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=ubuntu-16.10
+      install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+        travis/install_linux.sh
+      script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+        travis/postsubmit.sh DefaultDebug BuildLib
+      before_cache:
+        docker cp storm:/storm/. .
+    - stage: Build library 1
+      os: linux
+      compiler: gcc
+      env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=ubuntu-16.10
+      install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+        travis/install_linux.sh
+      script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+        travis/postsubmit.sh DefaultRelease BuildLib
+      before_cache:
+        docker cp storm:/storm/. .
+    - stage: Build library 1
+      os: linux
+      compiler: gcc
+      env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=debian-9
+      install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+        travis/install_linux.sh
+      script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+        travis/postsubmit.sh DefaultDebug BuildLib
+      before_cache:
+        docker cp storm:/storm/. .
+    - stage: Build library 1
+      os: linux
+      compiler: gcc
+      env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=debian-9
+      install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+        travis/install_linux.sh
+      script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+        travis/postsubmit.sh DefaultRelease BuildLib
+      before_cache:
+        docker cp storm:/storm/. .
+    - stage: Build library 1
+      os: osx
+      compiler: clang
+      env: BUILD=DefaultDebug COMPILER=clang-4.0 STL=libc++
+      install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/install_osx.sh
+      script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/postsubmit.sh DefaultDebug BuildLib
+    - stage: Build library 1
+      os: osx
+      compiler: clang
+      env: BUILD=DefaultRelease COMPILER=clang-4.0 STL=libc++
+      install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/install_osx.sh
+      script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/postsubmit.sh DefaultRelease BuildLib
 
diff --git a/travis/generate_travis.py b/travis/generate_travis.py
index 69ef83c87..46418a5d9 100644
--- a/travis/generate_travis.py
+++ b/travis/generate_travis.py
@@ -20,10 +20,11 @@ build_types = [
 
 # Stages in travis
 stages = [
-    ("Build dependencies", "BuildDep"),
-    ("Build library", "BuildLib"),
-    ("Build all", "BuildAll"),
-    ("Test all", "TestAll"),
+    ("Build dependencies", "BuildDep", False),
+    ("Build library 1", "BuildLib", True),
+    ("Build library 2", "BuildLib", False),
+    ("Build all", "BuildAll", False),
+    ("Test all", "TestAll", False),
 ]
 
 
@@ -60,42 +61,59 @@ if __name__ == "__main__":
     s += "  include:\n"
 
     # Generate all configurations
+    allowedFailures = ""
     for stage in stages:
         s += "\n"
-        s += "  ###\n"
-        s += "  # Stage: {}\n".format(stage)
-        s += "  ###\n"
+        s += "    ###\n"
+        s += "    # Stage: {}\n".format(stage[0])
+        s += "    ###\n"
         s += "\n"
         # Linux via Docker
         for config in configs_linux:
             linux = config[0]
             compiler = "{}{}".format(config[1], config[2])
-            s += "  # {}\n".format(linux)
+            s += "    # {}\n".format(linux)
+            buildConfig = ""
             for build in build_types:
-                s += "  - stage: {}\n".format(stage[0])
-                s += "    os: linux\n"
-                s += "    compiler: {}\n".format(config[1])
-                s += "    env: BUILD={} COMPILER={} LINUX={}\n".format(build, compiler, linux)
-                s += "    install: export OS=linux; export COMPILER='{}'; export LINUX='{}';\n".format(compiler, linux)
-                s += "      travis/install_linux.sh\n"
-                s += "    script: export OS=linux; export COMPILER='{}'; export LINUX='{}';\n".format(compiler, linux)
-                s += "      travis/postsubmit.sh {} {}\n".format(build, stage[1])
-                s += "    before_cache:\n"
-                s += "      docker cp storm:/storm/. .\n"
+                buildConfig += "    - stage: {}\n".format(stage[0])
+                buildConfig += "      os: linux\n"
+                buildConfig += "      compiler: {}\n".format(config[1])
+                buildConfig += "      env: BUILD={} COMPILER={} LINUX={}\n".format(build, compiler, linux)
+                buildConfig += "      install: export OS=linux; export COMPILER='{}'; export LINUX='{}';\n".format(compiler, linux)
+                buildConfig += "        travis/install_linux.sh\n"
+                buildConfig += "      script: export OS=linux; export COMPILER='{}'; export LINUX='{}';\n".format(compiler, linux)
+                buildConfig += "        travis/postsubmit.sh {} {}\n".format(build, stage[1])
+                buildConfig += "      before_cache:\n"
+                buildConfig += "        docker cp storm:/storm/. .\n"
+            s += buildConfig
+            if stage[2]:
+                allowedFailures += buildConfig
 
         # Mac OS X
         for config in configs_mac:
             osx = config[0]
             compiler = "{}{}".format(config[1], config[2])
-            s += "  # {}\n".format(osx)
+            s += "    # {}\n".format(osx)
+            buildConfig = ""
             for build in build_types:
-                s += "  - stage: {}\n".format(stage[0])
-                s += "    os: osx\n"
-                s += "    compiler: {}\n".format(config[1])
-                s += "    env: BUILD={} COMPILER={} STL=libc++\n".format(build, compiler)
-                s += "    install: export OS=osx; export COMPILER='{}'; export STL='libc++';\n".format(compiler)
-                s += "      travis/install_osx.sh\n"
-                s += "    script: export OS=osx; export COMPILER='{}'; export STL='libc++';\n".format(compiler)
-                s += "      travis/postsubmit.sh {} {}\n".format(build, stage[1])
+                buildConfig += "    - stage: {}\n".format(stage[0])
+                buildConfig += "      os: osx\n"
+                buildConfig += "      compiler: {}\n".format(config[1])
+                buildConfig += "      env: BUILD={} COMPILER={} STL=libc++\n".format(build, compiler)
+                buildConfig += "      install: export OS=osx; export COMPILER='{}'; export STL='libc++';\n".format(compiler)
+                buildConfig += "        travis/install_osx.sh\n"
+                buildConfig += "      script: export OS=osx; export COMPILER='{}'; export STL='libc++';\n".format(compiler)
+                buildConfig += "        travis/postsubmit.sh {} {}\n".format(build, stage[1])
+            s += buildConfig
+            if stage[2]:
+                allowedFailures += buildConfig
+
+    # Allow failures
+    s += "\n"
+    s += "  #\n"
+    s += "  # Allowed failures\n"
+    s += "  #\n"
+    s += "  allow_failures:\n"
+    s += allowedFailures
 
     print(s)
diff --git a/travis/postsubmit.sh b/travis/postsubmit.sh
index a8b5b3de1..0c4e93603 100755
--- a/travis/postsubmit.sh
+++ b/travis/postsubmit.sh
@@ -4,7 +4,7 @@
 set -e
 
 : ${N_JOBS:=2}
-: ${TIMEOUT:=2200}
+: ${TIMEOUT:=2000}
 
 if [ "$STL" != "" ]
 then