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
 
diff --git a/bin/render.cpp b/bin/render.cpp
index 3da0c9358..2248d8603 100644
--- a/bin/render.cpp
+++ b/bin/render.cpp
@@ -9,13 +9,17 @@
 #include <mbgl/storage/default_file_source.hpp>
 #include <mbgl/storage/sqlite_cache.hpp>
 
+#pragma clang diagnostic push
 #pragma GCC diagnostic push
-#ifndef __clang__
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wunused-local-typedefs"
+#else
 #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
 #pragma GCC diagnostic ignored "-Wshadow"
 #endif
 #include <boost/program_options.hpp>
 #pragma GCC diagnostic pop
+#pragma clang diagnostic pop
 
 namespace po = boost::program_options;
 
diff --git a/macosx/main.mm b/macosx/main.mm
index 24251e6d4..7698773e7 100644
--- a/macosx/main.mm
+++ b/macosx/main.mm
@@ -12,13 +12,17 @@
 
 #import <Foundation/Foundation.h>
 
+#pragma clang diagnostic push
 #pragma GCC diagnostic push
-#ifndef __clang__
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wunused-local-typedefs"
+#else
 #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
 #pragma GCC diagnostic ignored "-Wshadow"
 #endif
 #include <boost/program_options.hpp>
 #pragma GCC diagnostic pop
+#pragma clang diagnostic pop
 
 #include <iostream>