diff --git a/.mason b/.mason
index d8597d944..36dc9282d 160000
--- a/.mason
+++ b/.mason
@@ -1 +1 @@
-Subproject commit d8597d944533dbb5e28d08dfdba22a82c93171b7
+Subproject commit 36dc9282d7b79b4533c511529d6f83fe5719f673
diff --git a/.travis.yml b/.travis.yml
index 6d7d31123..f9d22b51e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ matrix:
           sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
           packages: [ 'gdb', 'clang-3.5', 'libstdc++-4.9-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
     - os: osx
-      osx_image: xcode6.4
+      osx_image: xcode7
       env: FLAVOR=osx BUILDTYPE=Debug
     - os: osx
       osx_image: xcode7
@@ -77,15 +77,15 @@ matrix:
           sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
           packages: [ 'gdb', 'clang-3.5', 'libstdc++-4.9-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
     - os: osx
-      osx_image: xcode6.4
+      osx_image: xcode7
       compiler: clang
       env: FLAVOR=node NODE_VERSION=iojs-v3
     - os: osx
-      osx_image: xcode6.4
+      osx_image: xcode7
       compiler: clang
       env: FLAVOR=node NODE_VERSION=0.12
     - os: osx
-      osx_image: xcode6.4
+      osx_image: xcode7
       compiler: clang
       env: FLAVOR=node NODE_VERSION=0.10