diff --git a/.gitignore b/.gitignore
index d8959d4f3..2ea84e982 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,8 +16,15 @@
 /test/build
 /test/node_modules
 /test/fixtures/*/*_actual.*
+/test/fixtures/api/1.png
+/test/fixtures/api/2.png
+/test/fixtures/database/*.db
 /include/mbgl/shader/shaders.hpp
 /src/shader/shaders_gl.cpp
 /src/shader/shaders_gles2.cpp
 /bin/style.bin.js
 *~
+
+/ios/benchmark/assets/tiles/mapbox.mapbox-streets-v6/
+/ios/benchmark/assets/tiles/mapbox.mapbox-terrain-v2/
+/ios/benchmark/assets/glyphs/DIN Offc Pro*/
diff --git a/.mason b/.mason
index 03869fd11..c43967404 160000
--- a/.mason
+++ b/.mason
@@ -1 +1 @@
-Subproject commit 03869fd11e4bc619d3ba7e4f8a1f00d4612c90ea
+Subproject commit c43967404c84d020d63f6aba450d97770dfeaebb
diff --git a/.travis.yml b/.travis.yml
index 71936b872..f08aa8149 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,100 +1,105 @@
-language: cpp
+language: android
+
+sudo: false
 
 matrix:
   exclude:
     - os: linux
   include:
     - os: linux
-      env: CONFIG=release MASON_PLATFORM=android MASON_ANDROID_ABI=arm-v7 TESTMUNK=yes
-      compiler: clang
+      env: FLAVOR=linux CXX=g++-4.9 BUILDTYPE=Release
+      addons:
+        apt:
+          sources: [ 'ubuntu-toolchain-r-test' ]
+          packages: [ 'gdb', 'g++-4.9', 'gcc-4.9', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
     - os: linux
-      env: CONFIG=debug MASON_PLATFORM=android MASON_ANDROID_ABI=arm-v7 TESTMUNK=no
-      compiler: clang
+      env: FLAVOR=linux CXX=clang++-3.5 BUILDTYPE=Debug
+      addons:
+        apt:
+          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: linux
-      env: CONFIG=release MASON_PLATFORM=android MASON_ANDROID_ABI=arm-v5 TESTMUNK=no
-      compiler: clang
-    - os: linux
-      env: CONFIG=release MASON_PLATFORM=android MASON_ANDROID_ABI=arm-v8 TESTMUNK=no
-      compiler: clang
-    - os: linux
-      env: CONFIG=release MASON_PLATFORM=android MASON_ANDROID_ABI=x86 TESTMUNK=no
-      compiler: clang
-    - os: linux
-      env: CONFIG=release MASON_PLATFORM=android MASON_ANDROID_ABI=mips TESTMUNK=no
-      compiler: clang
-    - os: linux
-      env: CONFIG=release MASON_PLATFORM=android MASON_ANDROID_ABI=mips-64 TESTMUNK=no
-      compiler: clang
-    - os: linux
-      env: BUILDTYPE=Release JOBS=16
-      compiler: clang
-    - os: linux
-      env: BUILDTYPE=Debug JOBS=16
-      compiler: clang
-    - os: linux
-      env: BUILDTYPE=Release JOBS=8
-      compiler: gcc
+      env: FLAVOR=linux CXX=clang++-3.5 BUILDTYPE=Release
+      addons:
+        apt:
+          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
-      env: BUILDTYPE=Debug JOBS=8 MASON_PLATFORM=osx
-      compiler: clang
+      env: FLAVOR=osx BUILDTYPE=Debug
     - os: osx
-      env: BUILDTYPE=Release JOBS=8 MASON_PLATFORM=ios
-      compiler: clang
+      env: FLAVOR=ios BUILDTYPE=Release
+    - os: linux
+      env: FLAVOR=android ANDROID_ABI=arm-v7 BUILDTYPE=Release
+      android:
+        components: [ 'build-tools-22.0.1', 'android-22', 'extra' ]
+      addons:
+        apt:
+          packages: [ 'lib32stdc++6' ]
+    - os: linux
+      env: FLAVOR=android ANDROID_ABI=arm-v7 BUILDTYPE=Debug
+      android:
+        components: [ 'build-tools-22.0.1', 'android-22', 'extra' ]
+      addons:
+        apt:
+          packages: [ 'lib32stdc++6' ]
+    - os: linux
+      env: FLAVOR=android ANDROID_ABI=arm-v8 BUILDTYPE=Release
+      android:
+        components: [ 'build-tools-22.0.1', 'android-22', 'extra' ]
+      addons:
+        apt:
+          packages: [ 'lib32stdc++6' ]
+    - os: linux
+      env: FLAVOR=android ANDROID_ABI=x86 BUILDTYPE=Release
+      android:
+        components: [ 'build-tools-22.0.1', 'android-22', 'extra' ]
+      addons:
+        apt:
+          packages: [ 'lib32stdc++6' ]
+    - os: linux
+      env: FLAVOR=android ANDROID_ABI=mips BUILDTYPE=Release
+      android:
+        components: [ 'build-tools-22.0.1', 'android-22', 'extra' ]
+      addons:
+        apt:
+          packages: [ 'lib32stdc++6' ]
 
 env:
   global:
-   - secure: "MZHblLZXG/jWf2w0ZFlxCLDwx2qtGgRDODQyg1BR7JIuMz6AtWv8XR/sUczWLbiABCL0a/NzJF1g4v2pI7X69IntcjOdIABBgTh7++6+1TJ0Kp8viEltb55nQG3lHy/R6fOaI7Pj9tuCX0PCRtGA5C/fGnodLGEjy3RVOJ09ln0="
-   - secure: "KaSQbhgjtV7ZCkesHmvrNsbQVjk5SPfGKB1VkWenRGYhLF45HpSRNwSxMQddZ566Pg7qIFgF1iWl/B0QW3B6AWL5WmzQ5AOJgwS876pNIc/UT7ubMPtgAtjpvw1bQvQP3B8MrB+3OE5c6tD+a3LhR9krV//dOsfErR5Yy+3Mbkc="
-   - ANDROID_BUILD_INSTANCE_PROFILE: arn:aws:iam::234858372212:instance-profile/android-gl-build/travis/instance-profile/travis-mapbox-gl-native-AndroidInstanceProfile-13EA815DD8IQ9
-   - secure: "RiBIBfVhhaMjU5ksuwJO3shdvG9FpinBjdSv4co9jg9171SR8edNriedHjVKSIeBhSGNmZmX+twS3dJS/By6tl/LKh9sTynA+ZAYYljkE7jn881B/gMrlYvdAA6og5KvkhV1/0iJWlhuZrMTkhpDR200iLgg3EWBhWjltzmDW/I="
-   - secure: "CHBiUM60TolDbQnn+4IRA/tvOKwKs3g9EDvv8YHSJMg3FuHmjKQkprBasvxf3hnTXg4WLZEubmeDcyJ6RRzPP5mMSr/hksYl0pSjj/6TUecE5fHPVVeN7txVqkpOBf9i45Y+iBUQMjBb1NnDK3pHXxpnAs1Q/pe7vReErj4GF1U="
-   - LD_LIBRARY_PATH: '/usr/local/lib'
-   - TERM: dumb
-   # begin iOS code signing
-   - secure: "I6Iu75X1E+js5tzijtKi1EGtIuBcA4/25nDYe0svV4HAtujY71ZJZ4eB6355CKhFXpLXrF3i7eKVX3v+zWS0QROPEWacgsqsvNg+Ba9cnznW/faUSOYekCfhzWd/6reYDM7KzKAQwSUHLk9JIWK/kkmi4r+vVJK7h+tjPllK5YA="
-   - IOS_APP_NAME="Mapbox GL"
-   - 'IOS_DEVELOPER_NAME="iPhone Distribution: Mapbox, Inc."'
-   - IOS_PROFILE_NAME="ios-in-house"
-   - secure: "nQqSM8rd7OHtV4MqmNqVnkrVHqxKqQsaWRYk4/nPdhbeVWtTtkk0df711LrF1TUtbEPEewHxYUvTZ/UXmwJNeoKdzTHavI8hnatRkgjyxGERPn1il1Otelht9I+LQQHf+plrpRjVWBrNIW0Zox1B3cqn6d3NglpbXrEQ2EjYGNA="
-   # end iOS code signing
-   - KIF_SCREENSHOTS="${TRAVIS_BUILD_DIR}/screenshots"
+    - TERM: dumb
+    # AWS
+    - secure: "MZHblLZXG/jWf2w0ZFlxCLDwx2qtGgRDODQyg1BR7JIuMz6AtWv8XR/sUczWLbiABCL0a/NzJF1g4v2pI7X69IntcjOdIABBgTh7++6+1TJ0Kp8viEltb55nQG3lHy/R6fOaI7Pj9tuCX0PCRtGA5C/fGnodLGEjy3RVOJ09ln0="
+    - secure: "KaSQbhgjtV7ZCkesHmvrNsbQVjk5SPfGKB1VkWenRGYhLF45HpSRNwSxMQddZ566Pg7qIFgF1iWl/B0QW3B6AWL5WmzQ5AOJgwS876pNIc/UT7ubMPtgAtjpvw1bQvQP3B8MrB+3OE5c6tD+a3LhR9krV//dOsfErR5Yy+3Mbkc="
+    # Access Token
+    - secure: "RiBIBfVhhaMjU5ksuwJO3shdvG9FpinBjdSv4co9jg9171SR8edNriedHjVKSIeBhSGNmZmX+twS3dJS/By6tl/LKh9sTynA+ZAYYljkE7jn881B/gMrlYvdAA6og5KvkhV1/0iJWlhuZrMTkhpDR200iLgg3EWBhWjltzmDW/I="
+    # Testmunk
+    - secure: "CHBiUM60TolDbQnn+4IRA/tvOKwKs3g9EDvv8YHSJMg3FuHmjKQkprBasvxf3hnTXg4WLZEubmeDcyJ6RRzPP5mMSr/hksYl0pSjj/6TUecE5fHPVVeN7txVqkpOBf9i45Y+iBUQMjBb1NnDK3pHXxpnAs1Q/pe7vReErj4GF1U="
+    # iOS code signing
+    - secure: "I6Iu75X1E+js5tzijtKi1EGtIuBcA4/25nDYe0svV4HAtujY71ZJZ4eB6355CKhFXpLXrF3i7eKVX3v+zWS0QROPEWacgsqsvNg+Ba9cnznW/faUSOYekCfhzWd/6reYDM7KzKAQwSUHLk9JIWK/kkmi4r+vVJK7h+tjPllK5YA="
+    - IOS_APP_NAME="Mapbox GL"
+    - 'IOS_DEVELOPER_NAME="iPhone Distribution: Mapbox, Inc."'
+    - IOS_PROFILE_NAME="ios-in-house"
+    - secure: "nQqSM8rd7OHtV4MqmNqVnkrVHqxKqQsaWRYk4/nPdhbeVWtTtkk0df711LrF1TUtbEPEewHxYUvTZ/UXmwJNeoKdzTHavI8hnatRkgjyxGERPn1il1Otelht9I+LQQHf+plrpRjVWBrNIW0Zox1B3cqn6d3NglpbXrEQ2EjYGNA="
+    - KIF_SCREENSHOTS="${TRAVIS_BUILD_DIR}/screenshots"
 
 before_install:
-- if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then sudo service mysql stop; fi
-- if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then sudo service postgresql stop; fi
-- source ./scripts/local_mason.sh
 - source ./scripts/travis_helper.sh
-- source ./scripts/install_node.sh
-- source ./scripts/flags.sh
-- ./scripts/travis_before_install.sh
-- if [[ ${TRAVIS_OS_NAME} == "linux" && ${MASON_PLATFORM} != "android" ]]; then export LD_LIBRARY_PATH=`mason prefix mesa 10.4.3`/lib; fi
-- if [[ ${TRAVIS_OS_NAME} == "linux" && ${MASON_PLATFORM} != "android" ]]; then glxinfo; fi
-- if [[ ${TRAVIS_OS_NAME} == "osx" && ${TEST_OS} == "ios" ]]; then mkdir -p ${KIF_SCREENSHOTS}; fi
 
 install:
-- ulimit -c
-
-before_script:
- # Set the core file limit to unlimited so a core file is generated upon crash
- - ulimit -c unlimited -S
- # begin iOS code signing
- - openssl aes-256-cbc -k "$IOS_ENCRYPTION_SECRET" -in scripts/ios_travis/ios-in-house.mobileprovision.enc -d -a -out scripts/ios_travis/ios-in-house.mobileprovision
- - openssl aes-256-cbc -k "$IOS_ENCRYPTION_SECRET" -in scripts/ios_travis/ios-dist.cer.enc                 -d -a -out scripts/ios_travis/ios-dist.cer
- - openssl aes-256-cbc -k "$IOS_ENCRYPTION_SECRET" -in scripts/ios_travis/ios-dist.p12.enc                 -d -a -out scripts/ios_travis/ios-dist.p12
- - ./scripts/ios_travis/add-key.sh
- # end iOS code signing
+- ./scripts/${FLAVOR}/install.sh
 
 script:
-- ./scripts/travis_script.sh
-
-after_script:
-- ./scripts/ios_travis/remove-key.sh
+- ./scripts/${FLAVOR}/run.sh
 
 after_failure:
-- if [[ ${TRAVIS_OS_NAME} == "osx" && ${TEST_OS} == "ios" ]]; then ./scripts/ios_travis/upload_screenshots.sh; fi
+- "[ -f ./scripts/${FLAVOR}/after_failure.sh ] && ./scripts/${FLAVOR}/after_failure.sh"
+
+after_failure:
+- "[ -f ./scripts/${FLAVOR}/after_script.sh ] && ./scripts/${FLAVOR}/after_script.sh"
 
 notifications:
   slack:
     secure: HHQYr7sF8M1SzoWSqgKVYtwAgGdLLCyTMsQjFhEEQNYO92ZwURE5s03qWTGH5k8+4Yqn26yrXt3NztLC4JIOpcGervN2mSZyq4dZgFTcWEd61igw0qwSenlwvFfbE1ASK/KYCzfyn9MIfHN+ovwLoRxXZkPwinKDvl3DXjBaFNg=
+
 git:
   submodules: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..a417af376
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,13 @@
+# Changelog
+
+## 0.3.1
+
+- Temporarily removed `IBDesignable` support on iOS. 
+
+## 0.3.0
+
+- Initial iOS beta release. 
+
+Known issues: 
+
+- None. 
diff --git a/Makefile b/Makefile
index 11eb5e530..748105102 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,8 @@ endif
 
 ifeq ($(shell uname -s), Linux)
 HOST = linux
-JOBS ?= $(shell sysctl -n hw.ncpu)
+JOBS ?= $(shell grep --count processor /proc/cpuinfo)
+BUILD_ROOT = $(shell pwd)
 endif
 
 JOBS ?= 1
@@ -31,8 +32,12 @@ config/%.gypi: configure
 styles/styles:
 	git submodule update --init styles
 
+ifeq ($(shell uname -s), Darwin)
 SMCalloutView:
 	git submodule update --init platform/ios/vendor/SMCalloutView
+else
+SMCalloutView:
+endif
 
 KIF:
 	git submodule update --init test/ios/KIF
@@ -42,11 +47,11 @@ KIF:
 
 .PRECIOUS: Makefile/project
 Makefile/project: config/$(HOST).gypi styles/styles SMCalloutView
-	deps/run_gyp gyp/project.gyp $(CONFIG_$(HOST)) $(LIBS_$(HOST)) --generator-output=./build/$(HOST) -f make
+	deps/run_gyp gyp/$(HOST).gyp $(CONFIG_$(HOST)) $(LIBS_$(HOST)) --generator-output=./build/$(HOST) -f make
 
 .PRECIOUS: Xcode/project
 Xcode/project: config/$(HOST).gypi styles/styles SMCalloutView
-	deps/run_gyp gyp/project.gyp $(CONFIG_$(HOST)) $(LIBS_$(HOST)) --generator-output=./build/$(HOST) -f xcode
+	deps/run_gyp gyp/$(HOST).gyp $(CONFIG_$(HOST)) $(LIBS_$(HOST)) --generator-output=./build/$(HOST) -f xcode
 
 
 #### Library builds ############################################################
@@ -71,8 +76,9 @@ test-%: test
 	./scripts/run_tests.sh "build/$(HOST)/$(BUILDTYPE)/test" --gtest_filter=$*
 
 .PHONY: xtest
+xtest: XCPRETTY := $(shell ./scripts/xcpretty.sh)
 xtest: Xcode/project
-	xcodebuild -project ./build/osx/gyp/project.xcodeproj -configuration $(BUILDTYPE) -target test -jobs $(JOBS)
+	xcodebuild -project ./build/osx/gyp/osx.xcodeproj -configuration $(BUILDTYPE) -target test -jobs $(JOBS) $(XCPRETTY)
 
 xtest-%: xtest
 	./scripts/run_tests.sh "build/osx/Build/Products/$(BUILDTYPE)/test" --gtest_filter=$*
@@ -87,12 +93,16 @@ osx: Makefile/project
 run-osx: osx
 	"build/osx/$(BUILDTYPE)/Mapbox GL.app/Contents/MacOS/Mapbox GL"
 
+run-valgrind-osx: osx
+	(valgrind --leak-check=full --suppressions=scripts/valgrind.sup build/osx/$(BUILDTYPE)/Mapbox\ GL.app/Contents/MacOS/Mapbox\ GL)
+
 .PHONY: xosx-proj xosx run-xosx
 xosx-proj: Xcode/project
-	open ./build/osx/gyp/project.xcodeproj
+	open ./build/osx/gyp/osx.xcodeproj
 
+xosx: XCPRETTY := $(shell ./scripts/xcpretty.sh)
 xosx: Xcode/project
-	xcodebuild -project ./build/osx/gyp/project.xcodeproj -configuration $(BUILDTYPE) -target osxapp -jobs $(JOBS)
+	xcodebuild -project ./build/osx/gyp/osx.xcodeproj -configuration $(BUILDTYPE) -target osxapp -jobs $(JOBS) $(XCPRETTY)
 
 run-xosx: xosx
 	"gyp/build/$(BUILDTYPE)/Mapbox GL.app/Contents/MacOS/Mapbox GL"
@@ -105,24 +115,33 @@ xproj: xosx-proj
 #### iOS application builds ####################################################
 
 .PRECIOUS: Xcode/ios
-Xcode/ios: ios/app/mapboxgl-app.gyp config/ios.gypi styles/styles SMCalloutView
-	deps/run_gyp ios/app/mapboxgl-app.gyp $(CONFIG_ios) $(LIBS_ios) --generator-output=./build/ios -f xcode
+Xcode/ios: gyp/ios.gyp config/ios.gypi styles/styles SMCalloutView
+	deps/run_gyp gyp/ios.gyp $(CONFIG_ios) $(LIBS_ios) --generator-output=./build/ios -f xcode
 
 .PHONY: ios-proj ios isim ipackage
 ios-proj: Xcode/ios
-	open ./build/ios/ios/app/mapboxgl-app.xcodeproj
+	open ./build/ios/gyp/ios.xcodeproj
 
+ios: XCPRETTY := $(shell ./scripts/xcpretty.sh)
 ios: Xcode/ios
-	xcodebuild -sdk iphoneos ARCHS="arm64 armv7 armv7s" PROVISIONING_PROFILE="2b532944-bf3d-4bf4-aa6c-a81676984ae8" -project ./build/ios/ios/app/mapboxgl-app.xcodeproj -configuration Release -target iosapp -jobs $(JOBS)
+	xcodebuild -sdk iphoneos ARCHS="arm64 armv7 armv7s" PROVISIONING_PROFILE="19324a54-7455-4f0b-8e1c-e6957c718ebc" -project ./build/ios/gyp/ios.xcodeproj -configuration Release -target iosapp -jobs $(JOBS) $(XCPRETTY)
 
+ibench: XCPRETTY := $(shell ./scripts/xcpretty.sh)
+ibench: Xcode/ios
+	xcodebuild -sdk iphoneos ARCHS="arm64" PROVISIONING_PROFILE="19324a54-7455-4f0b-8e1c-e6957c718ebc" -project ./build/ios/gyp/ios.xcodeproj -configuration Release -target ios-bench -jobs $(JOBS) $(XCPRETTY)
+
+isim: XCPRETTY := $(shell ./scripts/xcpretty.sh)
 isim: Xcode/ios
-	xcodebuild -sdk iphonesimulator ARCHS="x86_64 i386" -project ./build/ios/ios/app/mapboxgl-app.xcodeproj -configuration Debug -target iosapp -jobs $(JOBS)
+	xcodebuild -sdk iphonesimulator ARCHS="x86_64 i386" -project ./build/ios/gyp/ios.xcodeproj -configuration Debug -target iosapp -jobs $(JOBS) $(XCPRETTY)
 
-ipackage: clean Xcode/ios
-	./scripts/package_ios.sh
+ipackage: Xcode/ios
+	JOBS=$(JOBS) ./scripts/ios/package.sh
 
-itest: ipackage KIF
-	./scripts/test_ios.sh
+ipackage-sim: Xcode/ios
+	JOBS=$(JOBS) ./scripts/ios/package.sh sim
+
+itest: ipackage-sim KIF
+	./scripts/ios/test.sh
 
 # Legacy name
 iproj: ios-proj
@@ -137,9 +156,13 @@ linux: Makefile/project
 run-linux: linux
 	(cd build/$(HOST)/$(BUILDTYPE) && ./mapbox-gl)
 
+run-valgrind-linux: linux
+	(cd build/$(HOST)/$(BUILDTYPE) && valgrind --leak-check=full --suppressions=$(BUILD_ROOT)/scripts/valgrind.sup ./mapbox-gl)
+
 .PHONY: xlinux run-xlinux
+xlinux: XCPRETTY := $(shell ./scripts/xcpretty.sh)
 xlinux: Xcode/project
-	xcodebuild -project ./build/osx/gyp/project.xcodeproj -configuration $(BUILDTYPE) -target linuxapp -jobs $(JOBS)
+	xcodebuild -project ./build/osx/gyp/osx.xcodeproj -configuration $(BUILDTYPE) -target linuxapp -jobs $(JOBS) $(XCPRETTY)
 
 run-xlinux: xlinux
 	"gyp/build/$(BUILDTYPE)/mapbox-gl"
@@ -180,9 +203,10 @@ android-project: android-lib
 render: Makefile/project
 	$(MAKE) -C build/$(HOST) BUILDTYPE=$(BUILDTYPE) mbgl-render
 
-.PHONY: xrender run-xrender
+.PHONY: xrender
+xrender: XCPRETTY := $(shell ./scripts/xcpretty.sh)
 xrender: Xcode/project
-	xcodebuild -project ./build/osx/gyp/project.xcodeproj -configuration $(BUILDTYPE) -target mbgl-render -jobs $(JOBS)
+	xcodebuild -project ./build/osx/gyp/osx.xcodeproj -configuration $(BUILDTYPE) -target mbgl-render -jobs $(JOBS) $(XCPRETTY)
 
 
 ##### Maintenace operations ####################################################
diff --git a/README.md b/README.md
index a44b13861..6b15f596c 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,10 @@
 [![Travis](https://api.travis-ci.org/mapbox/mapbox-gl-native.svg?branch=master)](https://travis-ci.org/mapbox/mapbox-gl-native/builds)
 
-An OpenGL renderer for [Mapbox Vector Tiles](https://www.mapbox.com/blog/vector-tiles),
-implemented in C++11, currently targeting iOS, OS X, Android, and Ubuntu Linux.
+An OpenGL renderer for [Mapbox Vector Tiles](https://www.mapbox.com/blog/vector-tiles), consisting of a C++ library for OS X and Linux and SDK bindings for iOS and Android.
 
 # Depends
 
- - Modern C++ compiler that supports `-std=c++11` (On OS X clang++, on Linux g++-4.8 or g++-4.9)
+ - Modern C++ compiler that supports `-std=c++14` (clang++ 3.5 or later or g++-4.9 or later)
  - [Boost headers](http://boost.org/)
  - [`zlib`](http://www.zlib.net/)
  - [`libpng`](http://www.libpng.org/pub/png/libpng.html)
@@ -46,15 +45,27 @@ Target OS X: 10.9+
 
 ## iOS
 
-If you merely want to install the library for iOS and try it out as an Objective-C consumer:
+### Use
 
-0. Use [Homebrew](http://brew.sh/) to install Boost headers: `brew install boost`.
-1. Run `./scripts/package_ios.sh`. The packaging script will produce the statically-linked `libMapboxGL.a`, `MapboxGL.bundle` for resources, and a `Headers` folder.
-2. Copy the contents of `build/ios/pkg/static` into your project. It should happen automatically, but ensure that:
+#### CocoaPods
+
+[CocoaPods](https://cocoapods.org) is preferred. Put the following in your `Podfile`:
+
+```ruby
+use_frameworks!
+pod 'MapboxGL'
+```
+
+#### Manually
+
+1. Use [Homebrew](http://brew.sh/) to install Boost headers: `brew install boost`.
+1. Install [appledoc](http://appledoc.gentlebytes.com/appledoc/) for API docs generation. We recommend [`2.2v963`](https://github.com/tomaz/appledoc/releases/tag/v2.2-963), which currently isn't available in Homebrew.
+1. Run `make ipackage`. The packaging script will produce the statically-linked `libMapboxGL.a`, `MapboxGL.bundle` for resources, a `Headers` folder, and a `Docs` folder with HTML API documentation.
+1. Copy the contents of `build/ios/pkg/static` into your project. It should happen automatically, but ensure that:
    - `Headers` is in your *Header Search Paths* (`HEADER_SEARCH_PATHS`) build setting.
    - `MapboxGL.bundle` is in your target's *Copy Bundle Resources* build phase.
    - `libMapboxGL.a` is in your target's *Link Binary With Libraries* build phase.
-3. Add the following Cocoa framework dependencies to your target's *Link Binary With Libraries* build phase:
+1. Add the following Cocoa framework dependencies to your target's *Link Binary With Libraries* build phase:
    - `CoreTelephony.framework`
    - `GLKit.framework`
    - `ImageIO.framework`
@@ -64,28 +75,31 @@ If you merely want to install the library for iOS and try it out as an Objective
    - `libc++.dylib`
    - `libsqlite3.dylib`
    - `libz.dylib`
-4. Add `-ObjC` to your target's "Other Linker Flags" build setting (`OTHER_LDFLAGS`).
-5. [Set the Mapbox API access token](#mapbox-api-access-tokens).
-6. `#import "MapboxGL.h"`
+1. Add `-ObjC` to your target's "Other Linker Flags" build setting (`OTHER_LDFLAGS`).
+1. [Set the Mapbox API access token](#mapbox-api-access-tokens).
+1. `#import "MapboxGL.h"`
 
-If you want to build from source and/or contribute to development of the project, run `make iproj`, which will create and open an Xcode project which can build the entire library from source as well as an Objective-C test app.
+### Development
 
-You can also run `make itest` to run the included tests. Requires `brew install xcpretty`. 
+If you want to build from source and/or contribute to development of the project, run `make iproj`, which will create and open an Xcode project which can build the entire library from source as well as an Objective-C test app. If you don't have an Apple Developer account, change the destination from "My Mac" to a simulator such as "iPhone 6" before you run and build the app.
+
+You can run `make itest` to run the included integration tests. Requires `gem install xcpretty`. If you want to run the tests in Xcode instead, first `make ipackage` to create a local static library version, then open `test/ios/ios-tests.xcodeproj`, and lastly `Command + U` on the `Mapbox GL Tests` application target.
 
 Target devices: iPhone 4S and above (5, 5c, 5s, 6, 6 Plus) and iPad 2 and above (3, 4, Mini, Air, Mini 2, Air 2).
 
-Target iOS: 7.0 through 8.1
+Target iOS: 7.0 through latest 8.x.
 
 
 ## Linux
 
 We are using Ubuntu for development. While the software should work on other distributions as well, we are not providing explicit build instructions here.
 
-Install GCC 4.8+ if you are running Ubuntu 13.10 or older. Alternatively, you can also use Clang 3.4+.
+Install GCC 4.9+ if you are running Ubuntu 13.10 or older. Alternatively, you can also use Clang 3.5+.
 
     sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
     sudo apt-get update
-    sudo apt-get install gcc-4.8 g++-4.8
+    sudo apt-get install gcc-4.9 g++-4.9
+    export CXX=g++-4.9
 
 Ensure you have git and other build essentials:
 
@@ -110,10 +124,6 @@ Otherwise, you can just install
 
     sudo apt-get install libboost-dev libboost-program-options-dev
 
-Once you're done installing the build dependencies, you can get started by running
-
-    ./configure
-
 Then, you can then proceed to build the library:
 
 	git submodule update --init
@@ -184,6 +194,35 @@ Run:
 
 You can then open `android/java` in Android Studio via "Import Non-Android Studio Project".
 
+### Setting up Android emulator
+
+If you want to run the test app in the emulator, we recommend the x86 build because it will run a lot faster.
+
+First ensure you have an `MAPBOX_ACCESS_TOKEN` environment variable set, as described below. Then, create an x86 build:
+
+    ANDROID_ABI=x86 make android
+
+In Android Studio, create an x86 AVD (Android Virtual Device):
+- Open AVD Manager via the Tools menu -> Android -> AVD Manager
+- Click "Create Virtual Device" at the bottom on AVD Manager window
+- Select one of the device profiles, for example the Nexus 4
+- Click "Next"
+- Select a Lollipop or Kitkat release with ABI of x86. If the line is greyed out click Download to download the OS files.
+- Click "Next"
+- Under "Emulated Performance" check "Host GPU" and uncheck "Store a snapshot for faster startup"
+- Click "Finish"
+- Close the AVD Manager
+
+Now when you run or debug the Android project you will see a window "Choose Device". Select your new AVD from drop down under "Launch emulator". If you select "Use same device for future launches" Android Studio will remember the selection and not ask again.
+
+### Running on a hardware device
+
+First read the [Google documentation](http://developer.android.com/tools/device.html) to set up your device and your OS to connect to the device.
+
+When you plug your device in and then run or debug the Android project you will see a window "Choose Device". Choose your device from the "Choose a running device" list.
+
+If your device does not show you have not set it up properly, double check the [Google documentation](http://developer.android.com/tools/device.html).
+
 # Troubleshooting
 
 To trigger a complete rebuild, run `make clean` and then start over generating the Xcode projects or Makefiles as described above.
@@ -204,7 +243,7 @@ For iOS and OS X use of the demo apps in Xcode, setup the access token by editin
 
 For Linux, set the environment variable `MAPBOX_ACCESS_TOKEN` to your token.
 
-For Android, gradle will take the value of `MAPBOX_ACCESS_TOKEN` and save it to `android/java/app/src/main/res/raw/token.txt` where the app will read it from.
+For Android, gradle will take the value of `MAPBOX_ACCESS_TOKEN` and save it to `android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt` where the app will read it from.
 
 # Style
 
diff --git a/android/cpp/jni.cpp b/android/cpp/jni.cpp
index ac5188484..2c7e75778 100644
--- a/android/cpp/jni.cpp
+++ b/android/cpp/jni.cpp
@@ -1,5 +1,6 @@
 #include <cstdint>
 #include <cinttypes>
+#include <cassert>
 
 #include <string>
 #include <locale>
@@ -255,20 +256,6 @@ void JNICALL nativeDestroySurface(JNIEnv *env, jobject obj, jlong nativeMapViewP
     nativeMapView->destroySurface();
 }
 
-void JNICALL nativeStart(JNIEnv *env, jobject obj, jlong nativeMapViewPtr) {
-    mbgl::Log::Debug(mbgl::Event::JNI, "nativeStart");
-    assert(nativeMapViewPtr != 0);
-    NativeMapView *nativeMapView = reinterpret_cast<NativeMapView *>(nativeMapViewPtr);
-    nativeMapView->start();
-}
-
-void JNICALL nativeStop(JNIEnv *env, jobject obj, jlong nativeMapViewPtr) {
-    mbgl::Log::Debug(mbgl::Event::JNI, "nativeStop");
-    assert(nativeMapViewPtr != 0);
-    NativeMapView *nativeMapView = reinterpret_cast<NativeMapView *>(nativeMapViewPtr);
-    nativeMapView->stop();
-}
-
 void JNICALL nativePause(JNIEnv *env, jobject obj, jlong nativeMapViewPtr) {
     mbgl::Log::Debug(mbgl::Event::JNI, "nativePause");
     assert(nativeMapViewPtr != 0);
@@ -287,14 +274,7 @@ void JNICALL nativeUpdate(JNIEnv *env, jobject obj, jlong nativeMapViewPtr) {
     mbgl::Log::Debug(mbgl::Event::JNI, "nativeUpdate");
     assert(nativeMapViewPtr != 0);
     NativeMapView *nativeMapView = reinterpret_cast<NativeMapView *>(nativeMapViewPtr);
-    nativeMapView->getMap().triggerUpdate();
-}
-
-void JNICALL nativeTerminate(JNIEnv *env, jobject obj, jlong nativeMapViewPtr) {
-    mbgl::Log::Debug(mbgl::Event::JNI, "nativeTerminate");
-    assert(nativeMapViewPtr != 0);
-    NativeMapView *nativeMapView = reinterpret_cast<NativeMapView *>(nativeMapViewPtr);
-    nativeMapView->getMap().terminate();
+    nativeMapView->getMap().update();
 }
 
 void JNICALL nativeResize(JNIEnv *env, jobject obj, jlong nativeMapViewPtr, jint width, jint height,
@@ -310,7 +290,7 @@ void JNICALL nativeResize(JNIEnv *env, jobject obj, jlong nativeMapViewPtr, jint
     assert(fbWidth <= UINT16_MAX);
     assert(fbHeight <= UINT16_MAX);
     NativeMapView *nativeMapView = reinterpret_cast<NativeMapView *>(nativeMapViewPtr);
-    nativeMapView->resize(width, height, ratio, fbWidth, fbHeight);
+    nativeMapView->getMap().resize(width, height, ratio);
 }
 
 void JNICALL nativeRemoveClass(JNIEnv *env, jobject obj, jlong nativeMapViewPtr, jstring clazz) {
@@ -938,12 +918,9 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
         {"nativeCreateSurface", "(JLandroid/view/Surface;)V",
          reinterpret_cast<void *>(&nativeCreateSurface)},
         {"nativeDestroySurface", "(J)V", reinterpret_cast<void *>(&nativeDestroySurface)},
-        {"nativeStart", "(J)V", reinterpret_cast<void *>(&nativeStart)},
-        {"nativeStop", "(J)V", reinterpret_cast<void *>(&nativeStop)},
         {"nativePause", "(J)V", reinterpret_cast<void *>(&nativePause)},
         {"nativeResume", "(J)V", reinterpret_cast<void *>(&nativeResume)},
         {"nativeUpdate", "(J)V", reinterpret_cast<void *>(&nativeUpdate)},
-        {"nativeTerminate", "(J)V", reinterpret_cast<void *>(&nativeTerminate)},
         {"nativeResize", "(JIIFII)V",
          reinterpret_cast<void *>(static_cast<void JNICALL (
              *)(JNIEnv *, jobject, jlong, jint, jint, jfloat, jint, jint)>(&nativeResize))},
diff --git a/android/cpp/native_map_view.cpp b/android/cpp/native_map_view.cpp
index 39a777bff..03530aeff 100644
--- a/android/cpp/native_map_view.cpp
+++ b/android/cpp/native_map_view.cpp
@@ -1,5 +1,6 @@
 #include <cstdlib>
 #include <ctime>
+#include <cassert>
 #include <memory>
 #include <list>
 #include <tuple>
@@ -16,9 +17,6 @@
 #include <mbgl/platform/gl.hpp>
 #include <mbgl/util/std.hpp>
 
-
-pthread_once_t loadGLExtensions = PTHREAD_ONCE_INIT;
-
 namespace mbgl {
 namespace android {
 
@@ -59,9 +57,11 @@ NativeMapView::NativeMapView(JNIEnv *env, jobject obj_)
     : mbgl::View(*this),
       fileCache(mbgl::android::cachePath + "/mbgl-cache.db"),
       fileSource(&fileCache),
-      map(*this, fileSource) {
+      map(*this, fileSource, MapMode::Continuous) {
     mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::NativeMapView");
 
+    map.pause();
+
     assert(env != nullptr);
     assert(obj_ != nullptr);
 
@@ -114,18 +114,22 @@ void NativeMapView::activate() {
 
 void NativeMapView::deactivate() {
     mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::deactivate");
-    if (!eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT)) {
-        mbgl::Log::Error(mbgl::Event::OpenGL, "eglMakeCurrent(EGL_NO_CONTEXT) returned error %d",
-                         eglGetError());
-        throw new std::runtime_error("eglMakeCurrent() failed");
+    if (display != EGL_NO_DISPLAY) {
+        if (!eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT)) {
+            mbgl::Log::Error(mbgl::Event::OpenGL, "eglMakeCurrent(EGL_NO_CONTEXT) returned error %d",
+                             eglGetError());
+            throw new std::runtime_error("eglMakeCurrent() failed");
+        }
+    } else {
+        mbgl::Log::Info(mbgl::Event::Android, "Not deactivating as we are not ready");
     }
 }
 
-void NativeMapView::invalidate() {
+void NativeMapView::invalidate(std::function<void()> render) {
     mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::invalidate");
 
     if ((display != EGL_NO_DISPLAY) && (surface != EGL_NO_SURFACE)) {
-        map.render();
+        render();
 
         if (!eglSwapBuffers(display, surface)) {
             mbgl::Log::Error(mbgl::Event::OpenGL, "eglSwapBuffers() returned error %d",
@@ -300,8 +304,6 @@ void NativeMapView::terminateContext() {
     context = EGL_NO_CONTEXT;
 }
 
-void loadExtensions();
-
 void NativeMapView::createSurface(ANativeWindow *window_) {
     mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::createSurface");
 
@@ -341,9 +343,11 @@ void NativeMapView::createSurface(ANativeWindow *window_) {
                         "SL Version"); // In the emulator this returns NULL with error code 0?
                                         // https://code.google.com/p/android/issues/detail?id=78977
         }
-        log_gl_string(GL_EXTENSIONS, "Extensions");
 
-        pthread_once(&loadGLExtensions, loadExtensions);
+        log_gl_string(GL_EXTENSIONS, "Extensions");
+        mbgl::gl::InitializeExtensions([] (const char * name) {
+             return reinterpret_cast<mbgl::gl::glProc>(eglGetProcAddress(name));
+        });
 
         if (!eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT)) {
             mbgl::Log::Error(mbgl::Event::OpenGL,
@@ -358,7 +362,7 @@ void NativeMapView::createSurface(ANativeWindow *window_) {
 void NativeMapView::destroySurface() {
     mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::destroySurface");
 
-    pause(true);
+    pause();
 
     if (surface != EGL_NO_SURFACE) {
         if (!eglDestroySurface(display, surface)) {
@@ -576,133 +580,11 @@ EGLConfig NativeMapView::chooseConfig(const EGLConfig configs[], EGLint numConfi
     return configId;
 }
 
-void NativeMapView::start() {
-    mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::start");
-
-    if (display == EGL_NO_DISPLAY) {
-        initializeDisplay();
-    }
-
-    if (context == EGL_NO_CONTEXT) {
-        initializeContext();
-    }
-
-    assert(display != EGL_NO_DISPLAY);
-    assert(context != EGL_NO_CONTEXT);
-
-    map.start(true);
-}
-
-void loadExtensions() {
-    const GLubyte *str = glGetString(GL_EXTENSIONS);
-    if (str == nullptr) {
-        mbgl::Log::Error(mbgl::Event::OpenGL, "glGetString(GL_EXTENSIONS) returned error %d",
-                         glGetError());
-        return;
-    }
-
-    std::string extensions(reinterpret_cast<const char *>(str));
-
-    if (extensions.find("GL_OES_vertex_array_object") != std::string::npos) {
-        mbgl::Log::Info(mbgl::Event::OpenGL, "Using GL_OES_vertex_array_object.");
-        gl::BindVertexArray = reinterpret_cast<gl::PFNGLBINDVERTEXARRAYPROC>(
-            eglGetProcAddress("glBindVertexArrayOES"));
-        gl::DeleteVertexArrays = reinterpret_cast<gl::PFNGLDELETEVERTEXARRAYSPROC>(
-            eglGetProcAddress("glDeleteVertexArraysOES"));
-        gl::GenVertexArrays = reinterpret_cast<gl::PFNGLGENVERTEXARRAYSPROC>(
-            eglGetProcAddress("glGenVertexArraysOES"));
-        gl::IsVertexArray =
-            reinterpret_cast<gl::PFNGLISVERTEXARRAYPROC>(eglGetProcAddress("glIsVertexArrayOES"));
-        assert(gl::BindVertexArray != nullptr);
-        assert(gl::DeleteVertexArrays != nullptr);
-        assert(gl::GenVertexArrays != nullptr);
-        assert(gl::IsVertexArray != nullptr);
-    }
-
-    if (extensions.find("GL_OES_packed_depth_stencil") != std::string::npos) {
-        mbgl::Log::Info(mbgl::Event::OpenGL, "Using GL_OES_packed_depth_stencil.");
-        gl::isPackedDepthStencilSupported = true;
-    }
-
-    if (extensions.find("GL_OES_depth24") != std::string::npos) {
-        gl::isDepth24Supported = true;
-    }
-
-    if (extensions.find("GL_KHR_debug") != std::string::npos) {
-        mbgl::Log::Info(mbgl::Event::OpenGL, "Using GL_KHR_debug.");
-        gl::DebugMessageControl = reinterpret_cast<gl::PFNGLDEBUGMESSAGECONTROLPROC>(
-            eglGetProcAddress("glDebugMessageControl"));
-        gl::DebugMessageInsert = reinterpret_cast<gl::PFNGLDEBUGMESSAGEINSERTPROC>(
-            eglGetProcAddress("glDebugMessageInsert"));
-        gl::DebugMessageCallback = reinterpret_cast<gl::PFNGLDEBUGMESSAGECALLBACKPROC>(
-            eglGetProcAddress("glDebugMessageCallback"));
-        gl::GetDebugMessageLog = reinterpret_cast<gl::PFNGLGETDEBUGMESSAGELOGPROC>(
-            eglGetProcAddress("glGetDebugMessageLog"));
-        gl::GetPointerv =
-            reinterpret_cast<gl::PFNGLGETPOINTERVPROC>(eglGetProcAddress("glGetPointerv"));
-        gl::PushDebugGroup =
-            reinterpret_cast<gl::PFNGLPUSHDEBUGGROUPPROC>(eglGetProcAddress("glPushDebugGroup"));
-        gl::PopDebugGroup =
-            reinterpret_cast<gl::PFNGLPOPDEBUGGROUPPROC>(eglGetProcAddress("glPopDebugGroup"));
-        gl::ObjectLabel =
-            reinterpret_cast<gl::PFNGLOBJECTLABELPROC>(eglGetProcAddress("glObjectLabel"));
-        gl::GetObjectLabel =
-            reinterpret_cast<gl::PFNGLGETOBJECTLABELPROC>(eglGetProcAddress("glGetObjectLabel"));
-        gl::ObjectPtrLabel =
-            reinterpret_cast<gl::PFNGLOBJECTPTRLABELPROC>(eglGetProcAddress("glObjectPtrLabel"));
-        gl::GetObjectPtrLabel = reinterpret_cast<gl::PFNGLGETOBJECTPTRLABELPROC>(
-            eglGetProcAddress("glGetObjectPtrLabel"));
-        assert(gl::DebugMessageControl != nullptr);
-        assert(gl::DebugMessageInsert != nullptr);
-        assert(gl::DebugMessageCallback != nullptr);
-        assert(gl::GetDebugMessageLog != nullptr);
-        assert(gl::GetPointerv != nullptr);
-        assert(gl::PushDebugGroup != nullptr);
-        assert(gl::PopDebugGroup != nullptr);
-        assert(gl::ObjectLabel != nullptr);
-        assert(gl::GetObjectLabel != nullptr);
-        assert(gl::ObjectPtrLabel != nullptr);
-        assert(gl::GetObjectPtrLabel != nullptr);
-    } else {
-        if (extensions.find("GL_EXT_debug_marker") != std::string::npos) {
-            mbgl::Log::Info(mbgl::Event::OpenGL, "Using GL_EXT_debug_marker.");
-            gl::InsertEventMarkerEXT = reinterpret_cast<gl::PFNGLINSERTEVENTMARKEREXTPROC>(
-                eglGetProcAddress("glInsertEventMarkerEXT"));
-            gl::PushGroupMarkerEXT = reinterpret_cast<gl::PFNGLPUSHGROUPMARKEREXTPROC>(
-                eglGetProcAddress("glPushGroupMarkerEXT"));
-            gl::PopGroupMarkerEXT = reinterpret_cast<gl::PFNGLPOPGROUPMARKEREXTPROC>(
-                eglGetProcAddress("glPopGroupMarkerEXT"));
-            assert(gl::InsertEventMarkerEXT != nullptr);
-            assert(gl::PushGroupMarkerEXT != nullptr);
-            assert(gl::PopGroupMarkerEXT != nullptr);
-        }
-
-        if (extensions.find("GL_EXT_debug_label") != std::string::npos) {
-            mbgl::Log::Info(mbgl::Event::OpenGL, "Using GL_EXT_debug_label.");
-            gl::LabelObjectEXT = reinterpret_cast<gl::PFNGLLABELOBJECTEXTPROC>(
-                eglGetProcAddress("glLabelObjectEXT"));
-            gl::GetObjectLabelEXT = reinterpret_cast<gl::PFNGLGETOBJECTLABELEXTPROC>(
-                eglGetProcAddress("glGetObjectLabelEXT"));
-            assert(gl::LabelObjectEXT != nullptr);
-            assert(gl::GetObjectLabelEXT != nullptr);
-        }
-    }
-}
-
-void NativeMapView::stop() {
-    mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::stop");
+void NativeMapView::pause() {
+    mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::pause");
 
     if ((display != EGL_NO_DISPLAY) && (context != EGL_NO_CONTEXT)) {
-        map.stop();
-    }
-}
-
-void NativeMapView::pause(bool waitForPause) {
-    mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::pause %s",
-                     (waitForPause) ? "true" : "false");
-
-    if ((display != EGL_NO_DISPLAY) && (context != EGL_NO_CONTEXT)) {
-        map.pause(waitForPause);
+        map.pause();
     }
 }
 
@@ -824,9 +706,5 @@ void NativeMapView::updateFps() {
     env = nullptr;
 }
 
-void NativeMapView::resize(uint16_t width, uint16_t height, float ratio, uint16_t fbWidth, uint16_t fbHeight) {
-    View::resize(width, height, ratio, fbWidth, fbHeight);
-}
-
 }
 }
diff --git a/android/java/MapboxGLAndroidSDK/build.gradle b/android/java/MapboxGLAndroidSDK/build.gradle
index 901aa6d9d..f0659b8c7 100644
--- a/android/java/MapboxGLAndroidSDK/build.gradle
+++ b/android/java/MapboxGLAndroidSDK/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.3'
+        classpath 'com.android.tools.build:gradle:1.2.2'
         classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
     }
 }
@@ -29,9 +29,9 @@ repositories {
 
 dependencies {
     compile 'commons-validator:commons-validator:1.4.1'
-    compile 'com.android.support:support-annotations:22.0.0'
-    compile 'com.android.support:support-v4:22.0.0'
-    compile 'com.squareup.okhttp:okhttp:2.2.0'
+    compile 'com.android.support:support-annotations:22.1.1'
+    compile 'com.android.support:support-v4:22.1.1'
+    compile 'com.squareup.okhttp:okhttp:2.3.0'
 }
 
 android {
diff --git a/android/java/MapboxGLAndroidSDK/gradle.properties b/android/java/MapboxGLAndroidSDK/gradle.properties
index 79e2dadca..8ba98ea4f 100644
--- a/android/java/MapboxGLAndroidSDK/gradle.properties
+++ b/android/java/MapboxGLAndroidSDK/gradle.properties
@@ -14,7 +14,7 @@ POM_DEVELOPER_NAME=Mapbox
 
 ANDROID_MIN_SDK=8
 ANDROID_BUILD_TARGET_SDK_VERSION=22
-ANDROID_BUILD_TOOLS_VERSION=22.0.0
+ANDROID_BUILD_TOOLS_VERSION=22.0.1
 ANDROID_BUILD_SDK_VERSION=22
 
 POM_NAME=Mapbox GL Android SDK
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java
index f865f9144..da4b40c4c 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java
+++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java
@@ -419,7 +419,6 @@ public class MapView extends SurfaceView {
 
         mNativeMapView.initializeDisplay();
         mNativeMapView.initializeContext();
-        mNativeMapView.start();
     }
 
     // Called when we need to save instance state
@@ -441,7 +440,6 @@ public class MapView extends SurfaceView {
     // Called when we need to clean up
     // Must be called from Activity onDestroy
     public void onDestroy() {
-        mNativeMapView.stop();
         mNativeMapView.terminateContext();
         mNativeMapView.terminateDisplay();
     }
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/NativeMapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/NativeMapView.java
index 4dcd5ef8e..7f074c6db 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/NativeMapView.java
+++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/NativeMapView.java
@@ -73,14 +73,6 @@ class NativeMapView {
         nativeDestroySurface(mNativeMapViewPtr);
     }
 
-    public void start() {
-        nativeStart(mNativeMapViewPtr);
-    }
-
-    public void stop() {
-        nativeStop(mNativeMapViewPtr);
-    }
-
     public void pause() {
         nativePause(mNativeMapViewPtr);
     }
@@ -386,18 +378,12 @@ class NativeMapView {
 
     private native void nativeDestroySurface(long nativeMapViewPtr);
 
-    private native void nativeStart(long nativeMapViewPtr);
-
-    private native void nativeStop(long nativeMapViewPtr);
-
     private native void nativePause(long nativeMapViewPtr);
 
     private native void nativeResume(long nativeMapViewPtr);
 
     private native void nativeUpdate(long nativeMapViewPtr);
 
-    private native void nativeTerminate(long nativeMapViewPtr);
-
     private native void nativeResize(long nativeMapViewPtr, int width,
             int height, float ratio, int fbWidth, int fbHeight);
 
diff --git a/android/java/MapboxGLAndroidSDKTestApp/build.gradle b/android/java/MapboxGLAndroidSDKTestApp/build.gradle
index 7cdd4fc91..5f2db91d7 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/android/java/MapboxGLAndroidSDKTestApp/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.3'
+        classpath 'com.android.tools.build:gradle:1.2.2'
         classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
     }
 }
@@ -31,7 +31,7 @@ gradle.projectsEvaluated {
 
 android {
     compileSdkVersion 22
-    buildToolsVersion "22.0.0"
+    buildToolsVersion "22.0.1"
 
     repositories {
         mavenCentral()
@@ -74,9 +74,9 @@ dependencies {
     compile(project(':MapboxGLAndroidSDK')) {
         transitive = true
     }
-    compile 'com.android.support:support-annotations:22.0.0'
-    compile 'com.android.support:support-v4:22.0.0'
-    compile 'com.android.support:appcompat-v7:22.0.0'
+    compile 'com.android.support:support-annotations:22.1.1'
+    compile 'com.android.support:support-v4:22.1.1'
+    compile 'com.android.support:appcompat-v7:22.1.1'
     compile 'com.mapzen.android:lost:1.0.0'
 }
 
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java
index bd7100d98..65cb17462 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java
@@ -128,8 +128,6 @@ public class MainActivity extends ActionBarActivity {
         mClassSpinner = (Spinner) findViewById(R.id.spinner_class);
         mOutdoorsClassAdapter = ArrayAdapter.createFromResource(getSupportActionBar().getThemedContext(),
                 R.array.outdoors_class_list, android.R.layout.simple_spinner_dropdown_item);
-        mSatelliteClassAdapter = ArrayAdapter.createFromResource(getSupportActionBar().getThemedContext(),
-                R.array.satellite_class_list, android.R.layout.simple_spinner_dropdown_item);
 
         // Prepare for GPS
         mLocationClient = new LostApiClient.Builder(this).build();
@@ -318,18 +316,37 @@ public class MainActivity extends ActionBarActivity {
         @Override
         public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
             switch (position) {
-                // Bright
+
+                // Mapbox Streets
                 case 0:
-                    mMapFragment.getMap().setStyleUrl("asset://styles/bright-v7.json");
+                    mMapFragment.getMap().setStyleUrl("asset://styles/mapbox-streets-v7.json");
                     mMapFragment.getMap().removeAllClasses();
                     mClassSpinner.setVisibility(View.INVISIBLE);
                     mClassSpinner.setAdapter(null);
                     mClassSpinner.setOnItemSelectedListener(null);
                     break;
 
-                // Basic
+                // Emerald
                 case 1:
-                    mMapFragment.getMap().setStyleUrl("asset://styles/basic-v7.json");
+                    mMapFragment.getMap().setStyleUrl("asset://styles/emerald-v7.json");
+                    mMapFragment.getMap().removeAllClasses();
+                    mClassSpinner.setVisibility(View.INVISIBLE);
+                    mClassSpinner.setAdapter(null);
+                    mClassSpinner.setOnItemSelectedListener(null);
+                    break;
+
+                // Light
+                case 2:
+                    mMapFragment.getMap().setStyleUrl("asset://styles/light-v7.json");
+                    mMapFragment.getMap().removeAllClasses();
+                    mClassSpinner.setVisibility(View.INVISIBLE);
+                    mClassSpinner.setAdapter(null);
+                    mClassSpinner.setOnItemSelectedListener(null);
+                    break;
+
+                // Dark
+                case 3:
+                    mMapFragment.getMap().setStyleUrl("asset://styles/dark-v7.json");
                     mMapFragment.getMap().removeAllClasses();
                     mClassSpinner.setVisibility(View.INVISIBLE);
                     mClassSpinner.setAdapter(null);
@@ -337,7 +354,7 @@ public class MainActivity extends ActionBarActivity {
                     break;
 
                 // Outdoors
-                case 2:
+                case 4:
                     mMapFragment.getMap().setStyleUrl("asset://styles/outdoors-v7.json");
                     mMapFragment.getMap().removeAllClasses();
                     mClassSpinner.setVisibility(View.VISIBLE);
@@ -345,33 +362,6 @@ public class MainActivity extends ActionBarActivity {
                     mClassSpinner.setOnItemSelectedListener(new OutdoorClassSpinnerListener());
                     break;
 
-                // Satellite
-                case 3:
-                    mMapFragment.getMap().setStyleUrl("asset://styles/satellite-v7.json");
-                    mMapFragment.getMap().removeAllClasses();
-                    mClassSpinner.setVisibility(View.VISIBLE);
-                    mClassSpinner.setAdapter(mSatelliteClassAdapter);
-                    mClassSpinner.setOnItemSelectedListener(new SatelliteClassSpinnerListener());
-                    break;
-
-                // Pencil
-                case 4:
-                    mMapFragment.getMap().setStyleUrl("asset://styles/pencil-v7.json");
-                    mMapFragment.getMap().removeAllClasses();
-                    mClassSpinner.setVisibility(View.INVISIBLE);
-                    mClassSpinner.setAdapter(null);
-                    mClassSpinner.setOnItemSelectedListener(null);
-                    break;
-
-                // Empty
-                case 5:
-                    mMapFragment.getMap().setStyleUrl("asset://styles/empty-v7.json");
-                    mMapFragment.getMap().removeAllClasses();
-                    mClassSpinner.setVisibility(View.INVISIBLE);
-                    mClassSpinner.setAdapter(null);
-                    mClassSpinner.setOnItemSelectedListener(null);
-                    break;
-
                 default:
                     onNothingSelected(parent);
                     break;
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
index 7b4e51b47..901e23192 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
@@ -12,12 +12,10 @@
     <string name="compass_desc">Map compass. Click to reset the map rotation to North.</string>
 
     <string-array name="style_list">
-        <item>Bright</item>
-        <item>Basic</item>
-        <item>Outdoors</item>
-        <item>Satellite</item>
-        <item>Pencil</item>
-        <item>Empty</item>
+        <item>Mapbox Streets</item>
+        <item>Emerald</item>
+        <item>Light</item>
+        <item>Dark</item>
     </string-array>
 
     <string-array name="outdoors_class_list">
@@ -25,10 +23,4 @@
         <item>Night</item>
     </string-array>
 
-    <string-array name="satellite_class_list">
-        <item>Labels + Contours</item>
-        <item>Labels Only</item>
-        <item>No Labels</item>
-    </string-array>
-
 </resources>
diff --git a/android/scripts/build-debug.sh b/android/scripts/build-debug.sh
deleted file mode 100755
index 450820a11..000000000
--- a/android/scripts/build-debug.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -o pipefail
-
-export BUILDTYPE=Debug
-
-./android/scripts/common.sh $1
diff --git a/android/scripts/build-release.sh b/android/scripts/build-release.sh
deleted file mode 100755
index 73c7fab81..000000000
--- a/android/scripts/build-release.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -o pipefail
-
-export BUILDTYPE=Release
-
-./android/scripts/common.sh $1
diff --git a/android/scripts/common.sh b/android/scripts/common.sh
deleted file mode 100755
index 0d610909b..000000000
--- a/android/scripts/common.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -o pipefail
-
-NAME=$1
-
-case `uname -s` in
-    'Darwin') export JOBS=`sysctl -n hw.ncpu` ;;
-    'Linux')  export JOBS=`nproc` ;;
-    *)        export JOBS=1 ;;
-esac
-
-
-export CC=clang CXX=clang++
-export MASON_PLATFORM=android
-
-mkdir -p ./android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw/
-echo "${MAPBOX_ACCESS_TOKEN}" >> ./android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt
-
-make android -j$JOBS BUILDTYPE=$BUILDTYPE JOBS=$JOBS
-
-S3_PREFIX=s3://mapbox/mapbox-gl-native/android/build/${NAME}
-APK_OUTPUTS=./android/java/MapboxGLAndroidSDKTestApp/build/outputs/apk
-
-# Upload the shared object.
-aws s3 cp \
-    ./build/android-${ANDROID_ABI}/${BUILDTYPE}/lib.target/libmapbox-gl.so \
-    ${S3_PREFIX}/libmapbox-gl.so
-
-# Upload either the debug or the release build
-if [ ${BUILDTYPE} == "Debug" ] ; then
-    aws s3 cp \
-        ${APK_OUTPUTS}/MapboxGLAndroidSDKTestApp-debug.apk \
-        ${S3_PREFIX}/MapboxGLAndroidSDKTestApp-debug.apk
-elif [ ${BUILDTYPE} == "Release" ] ; then
-    aws s3 cp \
-        ${APK_OUTPUTS}/MapboxGLAndroidSDKTestApp-release-unsigned.apk \
-        ${S3_PREFIX}/MapboxGLAndroidSDKTestApp-release-unsigned.apk
-fi
diff --git a/android/scripts/run-build.sh b/android/scripts/run-build.sh
deleted file mode 100755
index 9fa15a02b..000000000
--- a/android/scripts/run-build.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -o pipefail
-
-cwd=$(pwd)
-
-region="us-east-1"
-region_ami="ami-022e0c6a"
-sleep=10
-instance_name="android-gl-build-$TRAVIS_REPO_SLUG-$TRAVIS_JOB_NUMBER"
-echo $ami_name
-
-NAME=$TRAVIS_JOB_ID
-
-user_data="#!/bin/bash
-    cd /android
-    git clone git://github.com/mapbox/mapbox-gl-native.git
-
-    pushd mapbox-gl-native
-    if [[ $TRAVIS_PULL_REQUEST == 'false' ]]; then
-        git checkout $TRAVIS_COMMIT
-    else
-        git fetch origin +refs/pull/$TRAVIS_PULL_REQUEST/merge:
-        git checkout FETCH_HEAD
-    fi
-    git submodule update --init --recursive
-
-    export ANDROID_NDK_PATH=/android/android-ndk-r10d
-    export JAVA_HOME=/android/jdk1.7.0_71
-    export ANDROID_HOME=/android/android-sdk-linux
-    export PATH=\$PATH:/android/jdk1.7.0_71/bin
-    export MAPBOX_ACCESS_TOKEN=$MAPBOX_ACCESS_TOKEN
-    export TESTMUNK_KEY=$TESTMUNK_KEY
-    export TESTMUNK=$TESTMUNK
-    export MASON_ANDROID_ABI=$MASON_ANDROID_ABI
-    export ANDROID_ABI=$MASON_ANDROID_ABI
-
-    if ./android/scripts/build-$CONFIG.sh $NAME &>../build.log; then
-        echo 'ANDROID BUILD PASSED'
-    else
-        echo 'ANDROID BUILD FAILED'
-    fi
-    popd
-
-    aws s3 cp --region us-east-1 build.log s3://mapbox/mapbox-gl-native/android/build/${NAME}/build-log.txt
-    shutdown -P now"
-
-id=$(aws ec2 run-instances \
-    --region $region \
-    --image-id $region_ami \
-    --count 1 \
-    --instance-type m3.large \
-    --iam-instance-profile Arn="$ANDROID_BUILD_INSTANCE_PROFILE" \
-    --instance-initiated-shutdown-behavior terminate \
-    --user-data "$user_data" | jq -r '.Instances[0].InstanceId')
-
-echo "Instance: $region $id"
-
-sleep 10
-
-result=$(aws ec2 create-tags --region $region --resources $id --tags "Key=Name,Value=$instance_name")
-
-instance_status_terminated=$(aws ec2 describe-instances --region $region --instance-id $id | jq -r '.Reservations[0].Instances[0].State.Name')
-
-until [ "$instance_status_terminated" = "terminated" ]; do
-    instance_status_terminated=$(aws ec2 describe-instances --region $region --instance-id $id | jq -r '.Reservations[0].Instances[0].State.Name')
-    echo "Instance terminating status $region $id: $instance_status_terminated"
-    sleep $sleep
-done
-
-echo "Build finished"
-
-output=$(aws ec2 get-console-output --region $region --instance-id $id | jq -r '.Output')
-
-aws s3 cp --region $region s3://mapbox/mapbox-gl-native/android/build/${NAME}/build-log.txt build.log
-cat build.log
-
-if [[ $output == *"ANDROID BUILD PASSED"* ]]; then
-    echo "ANDROID BUILD PASSED"
-    exit 0
-else
-    echo "ANDROID BUILD FAILED"
-    exit 1
-fi
diff --git a/bin/render.cpp b/bin/render.cpp
index cd7a54f48..33e216f52 100644
--- a/bin/render.cpp
+++ b/bin/render.cpp
@@ -39,6 +39,7 @@ int main(int argc, char *argv[]) {
     std::string cache_file = "cache.sqlite";
     std::vector<std::string> classes;
     std::string token;
+    bool debug = false;
 
     po::options_description desc("Allowed options");
     desc.add_options()
@@ -51,6 +52,7 @@ int main(int argc, char *argv[]) {
         ("height,h", po::value(&height)->value_name("pixels")->default_value(height), "Image height")
         ("class,c", po::value(&classes)->value_name("name"), "Class name")
         ("token,t", po::value(&token)->value_name("key")->default_value(token), "Mapbox access token")
+        ("debug", po::bool_switch(&debug)->default_value(debug), "Debug mode")
         ("output,o", po::value(&output)->value_name("file")->default_value(output), "Output file name")
         ("cache,d", po::value(&cache_file)->value_name("file")->default_value(cache_file), "Cache database file name")
     ;
@@ -79,11 +81,8 @@ int main(int argc, char *argv[]) {
         }
     }
 
-
     HeadlessView view;
-    Map map(view, fileSource);
-
-    map.start(Map::Mode::Still);
+    Map map(view, fileSource, MapMode::Still);
 
     // Set access token if present
     if (token.size()) {
@@ -93,10 +92,14 @@ int main(int argc, char *argv[]) {
     map.setStyleJSON(style, ".");
     map.setClasses(classes);
 
-    view.resize(width, height, pixelRatio);
+    map.resize(width, height, pixelRatio);
     map.setLatLngZoom({ lat, lon }, zoom);
     map.setBearing(bearing);
 
+    if (debug) {
+        map.setDebug(debug);
+    }
+
     uv_async_t *async = new uv_async_t;
     uv_async_init(uv_default_loop(), async, [](uv_async_t *as, int) {
         std::unique_ptr<const StillImage> image(reinterpret_cast<const StillImage *>(as->data));
@@ -115,6 +118,4 @@ int main(int argc, char *argv[]) {
 
     // This loop will terminate once the async was fired.
     uv_run(uv_default_loop(), UV_RUN_DEFAULT);
-
-    map.stop();
 }
diff --git a/bin/render.gypi b/bin/render.gypi
index b205e7a95..2e1dbd8f7 100644
--- a/bin/render.gypi
+++ b/bin/render.gypi
@@ -34,12 +34,11 @@
         'ldflags': [
           '<@(glfw3_ldflags)',
           '<@(uv_ldflags)',
-          '<@(boost_ldflags)',
-          '-lboost_program_options'
         ],
         'libraries': [
           '<@(glfw3_static_libs)',
           '<@(uv_static_libs)',
+          '<@(boost_program_options_static_libs)'
         ],
       },
 
diff --git a/config/defaults.mk b/config/defaults.mk
index 2aa11ccbe..1449bf8e1 100644
--- a/config/defaults.mk
+++ b/config/defaults.mk
@@ -31,32 +31,32 @@ LIBS_linux += -Dcache_lib=$(word 1,$(CACHE) sqlite)
 LIBS_linux += --depth=. -Goutput_dir=.
 
 ANDROID_ABIS += android-lib-arm-v8
-ENV_android-arm-v8 = $(shell MASON_ANDROID_ABI=arm-v8 ./scripts/android_env.sh)
+ENV_android-arm-v8 = $(shell MASON_ANDROID_ABI=arm-v8 ./scripts/android/toolchain.sh)
 CONFIG_android-arm-v8 = -Dhost=android -Iconfig/android-arm-v8.gypi
 
 ANDROID_ABIS += android-lib-arm-v7
-ENV_android-arm-v7 = $(shell MASON_ANDROID_ABI=arm-v7 ./scripts/android_env.sh)
+ENV_android-arm-v7 = $(shell MASON_ANDROID_ABI=arm-v7 ./scripts/android/toolchain.sh)
 CONFIG_android-arm-v7 = -Dhost=android -Iconfig/android-arm-v7.gypi
 
 ANDROID_ABIS += android-lib-arm-v5
-ENV_android-arm-v5 = $(shell MASON_ANDROID_ABI=arm-v5 ./scripts/android_env.sh)
+ENV_android-arm-v5 = $(shell MASON_ANDROID_ABI=arm-v5 ./scripts/android/toolchain.sh)
 CONFIG_android-arm-v5 = -Dhost=android -Iconfig/android-arm-v5.gypi
 
 ANDROID_ABIS += android-lib-x86
-ENV_android-x86 = $(shell MASON_ANDROID_ABI=x86 ./scripts/android_env.sh)
+ENV_android-x86 = $(shell MASON_ANDROID_ABI=x86 ./scripts/android/toolchain.sh)
 CONFIG_android-x86 = -Dhost=android -Iconfig/android-x86.gypi
 
 # OpenSSL build is incomplete.
 # ANDROID_ABIS += android-lib-x86-64
-# ENV_android-x86-64 = $(shell MASON_ANDROID_ABI=x86-64 ./scripts/android_env.sh)
+# ENV_android-x86-64 = $(shell MASON_ANDROID_ABI=x86-64 ./scripts/android/toolchain.sh)
 # CONFIG_android-x86-64 = -Dhost=android -Iconfig/android-x86-64.gypi
 
 ANDROID_ABIS += android-lib-mips
-ENV_android-mips = $(shell MASON_ANDROID_ABI=mips ./scripts/android_env.sh)
+ENV_android-mips = $(shell MASON_ANDROID_ABI=mips ./scripts/android/toolchain.sh)
 CONFIG_android-mips = -Dhost=android -Iconfig/android-mips.gypi
 
 ANDROID_ABIS += android-lib-mips-64
-ENV_android-mips-64 = $(shell MASON_ANDROID_ABI=mips-64 ./scripts/android_env.sh)
+ENV_android-mips-64 = $(shell MASON_ANDROID_ABI=mips-64 ./scripts/android/toolchain.sh)
 CONFIG_android-mips-64 = -Dhost=android -Iconfig/android-mips-64.gypi
 
 LIBS_android  = -Dheadless_lib=none
diff --git a/configure b/configure
index 1d68f5e54..c1f7f6da1 100755
--- a/configure
+++ b/configure
@@ -15,7 +15,8 @@ function finish {
 trap finish EXIT
 
 # Install mason
-. ./scripts/local_mason.sh
+git submodule update --init .mason
+export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason"
 
 case ${MASON_PLATFORM} in
     'ios')
@@ -44,7 +45,8 @@ case ${MASON_PLATFORM} in
         LIBCURL_VERSION=system
         LIBUV_VERSION=0.10.28
         ZLIB_VERSION=system
-        BOOST_VERSION=system
+        BOOST_VERSION=1.57.0
+        BOOST_PROGRAM_OPTIONS_VERSION=1.57.0
         NUNICODE_VERSION=1.5.1
         LIBZIP_VERSION=0.11.2
         ;;
@@ -103,7 +105,11 @@ CONFIG="# Do not edit. Generated by the configure script.
 if [ ! -z ${BOOST_VERSION} ]; then
     mason install boost ${BOOST_VERSION}
     CONFIG+="    'boost_cflags%': $(quote_flags $(mason cflags boost ${BOOST_VERSION})),"$LN
-    CONFIG+="    'boost_ldflags%': $(quote_flags $(mason ldflags boost ${BOOST_VERSION})),"$LN
+fi
+
+if [ ! -z ${BOOST_PROGRAM_OPTIONS_VERSION} ]; then
+    mason install boost_libprogram_options ${BOOST_PROGRAM_OPTIONS_VERSION}
+    CONFIG+="    'boost_program_options_static_libs%': $(quote_flags $(mason static_libs boost_libprogram_options ${BOOST_VERSION})),"$LN
 fi
 
 if [ ! -z ${OPENSSL_VERSION} ]; then
diff --git a/docker/linux/test.sh b/docker/linux/test.sh
deleted file mode 100755
index 9ef9bf51f..000000000
--- a/docker/linux/test.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -o pipefail
-
-export TRAVIS_OS_NAME=linux
-
-cd build
-
-source ./scripts/local_mason.sh
-mason install mesa 10.4.3
-export LD_LIBRARY_PATH=`mason prefix mesa 10.4.3`/lib
-
-export DISPLAY=:99.0
-Xvfb :99 -ac -screen 0 1024x768x24 &
-
-if [[ ${CXX} == "g++" ]]; then
-    export CXX="g++-4.8"
-    export CC="gcc-4.8"
-fi
-
-source ./scripts/install_node.sh
-
-make linux -j`nproc`
-make test-* -j`nproc`
-./scripts/compare_images.sh
diff --git a/gyp/common.gypi b/gyp/common.gypi
index fbfa68711..d7d21f761 100644
--- a/gyp/common.gypi
+++ b/gyp/common.gypi
@@ -8,11 +8,11 @@
       ['OS=="mac"', {
         'xcode_settings': {
           'CLANG_CXX_LIBRARY': 'libc++',
-          'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
           'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
           'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
           'GCC_ENABLE_CPP_RTTI': 'YES',
           'OTHER_CPLUSPLUSFLAGS': [
+            '-std=c++1y',
             '-Werror',
             '-Wall',
             '-Wextra',
@@ -27,14 +27,14 @@
         },
       }, {
         'cflags_cc': [
-          '-std=c++11',
+          '-std=c++14',
           '-Werror',
           '-Wall',
           '-Wextra',
           '-Wshadow',
           '-Wno-variadic-macros',
           '-Wno-error=unused-parameter',
-          '-Wno-unknown-warning-option',
+          '-Wno-c++1y-extensions',
           '-frtti',
           '-fexceptions',
         ],
diff --git a/gyp/ios.gyp b/gyp/ios.gyp
new file mode 100644
index 000000000..f26ec3772
--- /dev/null
+++ b/gyp/ios.gyp
@@ -0,0 +1,6 @@
+{
+  'includes': [
+    '../ios/app/mapboxgl-app.gypi',
+    '../ios/benchmark/benchmark-ios.gypi',
+  ],
+}
diff --git a/gyp/linux.gyp b/gyp/linux.gyp
new file mode 100644
index 000000000..0f7126934
--- /dev/null
+++ b/gyp/linux.gyp
@@ -0,0 +1,7 @@
+{
+  'includes': [
+    '../linux/mapboxgl-app.gypi',
+    '../test/test.gypi',
+    '../bin/render.gypi',
+  ],
+}
diff --git a/gyp/osx.gyp b/gyp/osx.gyp
new file mode 100644
index 000000000..64663540b
--- /dev/null
+++ b/gyp/osx.gyp
@@ -0,0 +1,8 @@
+{
+  'includes': [
+    '../macosx/mapboxgl-app.gypi',
+    '../linux/mapboxgl-app.gypi',
+    '../test/test.gypi',
+    '../bin/render.gypi',
+  ],
+}
diff --git a/gyp/platform-android.gypi b/gyp/platform-android.gypi
index bfaac7d4f..7701393bb 100644
--- a/gyp/platform-android.gypi
+++ b/gyp/platform-android.gypi
@@ -12,6 +12,7 @@
       'sources': [
         '../platform/android/log_android.cpp',
         '../platform/android/asset_root.cpp',
+        '../platform/default/thread.cpp',
         '../platform/default/string_stdlib.cpp',
         '../platform/default/image.cpp',
         '../platform/default/image_reader.cpp',
diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi
index f70743118..0034831a9 100644
--- a/gyp/platform-ios.gypi
+++ b/gyp/platform-ios.gypi
@@ -15,22 +15,29 @@
         '../platform/darwin/application_root.mm',
         '../platform/darwin/asset_root.mm',
         '../platform/darwin/image.mm',
+        '../platform/darwin/nsthread.mm',
         '../platform/darwin/reachability.m',
         '../include/mbgl/ios/MapboxGL.h',
-        '../include/mbgl/ios/MGLMapboxEvents.h',
+        '../platform/ios/MGLMapboxEvents.h',
         '../platform/ios/MGLMapboxEvents.m',
         '../include/mbgl/ios/MGLMapView.h',
         '../include/mbgl/ios/MGLMapView+IBAdditions.h',
         '../platform/ios/MGLMapView.mm',
+        '../platform/ios/MGLFileCache.h',
+        '../platform/ios/MGLFileCache.mm',
+        '../include/mbgl/ios/MGLAccountManager.h',
+        '../platform/ios/MGLAccountManager.m',
         '../include/mbgl/ios/MGLAnnotation.h',
         '../include/mbgl/ios/MGLUserLocation.h',
         '../platform/ios/MGLUserLocation_Private.h',
         '../platform/ios/MGLUserLocation.m',
         '../platform/ios/MGLUserLocationAnnotationView.h',
         '../platform/ios/MGLUserLocationAnnotationView.m',
-        '../include/mbgl/ios/MGLMetricsLocationManager.h',
-        '../platform/ios/MGLMetricsLocationManager.m',
         '../include/mbgl/ios/MGLTypes.h',
+        '../platform/ios/MGLTypes.m',
+        '../platform/ios/NSBundle+MGLAdditions.h',
+        '../platform/ios/NSBundle+MGLAdditions.m',
+        '../platform/ios/NSException+MGLAdditions.h',
         '../platform/ios/NSProcessInfo+MGLAdditions.h',
         '../platform/ios/NSProcessInfo+MGLAdditions.m',
         '../platform/ios/NSString+MGLAdditions.h',
diff --git a/gyp/platform-linux.gypi b/gyp/platform-linux.gypi
index 30715f828..394433870 100644
--- a/gyp/platform-linux.gypi
+++ b/gyp/platform-linux.gypi
@@ -14,6 +14,7 @@
         '../platform/default/string_stdlib.cpp',
         '../platform/default/application_root.cpp',
         '../platform/default/asset_root.cpp',
+        '../platform/default/thread.cpp',
         '../platform/default/image.cpp',
         '../platform/default/image_reader.cpp',
         '../platform/default/png_reader.cpp',
diff --git a/gyp/platform-osx.gypi b/gyp/platform-osx.gypi
index 6d6c35b29..ae5194761 100644
--- a/gyp/platform-osx.gypi
+++ b/gyp/platform-osx.gypi
@@ -15,6 +15,7 @@
         '../platform/darwin/application_root.mm',
         '../platform/darwin/asset_root.mm',
         '../platform/darwin/image.mm',
+        '../platform/darwin/nsthread.mm',
       ],
 
       'variables': {
diff --git a/gyp/project.gyp b/gyp/project.gyp
deleted file mode 100644
index 9f53eef51..000000000
--- a/gyp/project.gyp
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  'conditions': [
-    ['host == "osx"', {
-      'includes': [
-        '../macosx/mapboxgl-app.gypi',
-        '../linux/mapboxgl-app.gypi',
-        '../test/test.gypi',
-        '../bin/render.gypi',
-      ]
-    }],
-    ['host == "linux"', {
-      'includes': [
-        '../linux/mapboxgl-app.gypi',
-        '../test/test.gypi',
-        '../bin/render.gypi',
-      ]
-    }],
-  ],
-}
diff --git a/gyp/styles.gypi b/gyp/styles.gypi
index 8b3032b58..06121f2d4 100644
--- a/gyp/styles.gypi
+++ b/gyp/styles.gypi
@@ -14,21 +14,22 @@
       ],
     },
     {
-      'target_name': 'bundle_styles',
+      'target_name': 'bundle_styles', # use this only for targets that create an App bundle
       'type': 'none',
       'hard_dependency': 1,
       'dependencies': [ 'touch_styles' ], # required for xcode http://openradar.appspot.com/7232149
-      'conditions': [
-        ['platform_lib == "osx" or platform_lib == "ios"', {
-          'direct_dependent_settings': {
-            'mac_bundle_resources': [ '../styles/styles' ],
-          }
-        }, {
-          'direct_dependent_settings': {
-            'copies': [{ 'files': [ '../styles/styles' ], 'destination': '<(PRODUCT_DIR)' }],
-          }
-        }]
-      ],
-    }
+      'direct_dependent_settings': {
+        'mac_bundle_resources': [ '../styles/styles' ],
+      }
+    },
+    {
+      'target_name': 'copy_styles', # use this only for targets that don't create an App bundle
+      'type': 'none',
+      'hard_dependency': 1,
+      'dependencies': [ 'touch_styles' ],
+      'direct_dependent_settings': {
+        'copies': [{ 'files': [ '../styles/styles' ], 'destination': '<(PRODUCT_DIR)' }],
+      }
+    },
   ]
 }
diff --git a/include/mbgl/android/native_map_view.hpp b/include/mbgl/android/native_map_view.hpp
index 14ccaba3f..fae239e07 100644
--- a/include/mbgl/android/native_map_view.hpp
+++ b/include/mbgl/android/native_map_view.hpp
@@ -23,7 +23,7 @@ public:
     void activate() override;
     void deactivate() override;
     void notify() override;
-    void invalidate() override;
+    void invalidate(std::function<void()> render) override;
 
     void notifyMapChange(mbgl::MapChange change, Duration delay = Duration::zero()) override;
 
@@ -39,17 +39,12 @@ public:
     void createSurface(ANativeWindow *window);
     void destroySurface();
 
-    void start();
-    void stop();
-
     void resume();
-    void pause(bool waitForPause = false);
+    void pause();
 
     void enableFps(bool enable);
     void updateFps();
 
-    void resize(uint16_t width, uint16_t height, float ratio, uint16_t fbWidth, uint16_t fbHeight);
-
 private:
     EGLConfig chooseConfig(const EGLConfig configs[], EGLint numConfigs);
 
@@ -60,11 +55,6 @@ private:
     jobject obj = nullptr;
 
     ANativeWindow *window = nullptr;
-
-    mbgl::SQLiteCache fileCache;
-    mbgl::DefaultFileSource fileSource;
-    mbgl::Map map;
-
     EGLDisplay display = EGL_NO_DISPLAY;
     EGLSurface surface = EGL_NO_SURFACE;
     EGLContext context = EGL_NO_CONTEXT;
@@ -79,6 +69,12 @@ private:
 
     bool fpsEnabled = false;
     double fps = 0.0;
+
+    // Ensure these are initialised last
+    mbgl::SQLiteCache fileCache;
+    mbgl::DefaultFileSource fileSource;
+    mbgl::Map map;
+
 };
 }
 }
diff --git a/include/mbgl/ios/MGLAccountManager.h b/include/mbgl/ios/MGLAccountManager.h
new file mode 100644
index 000000000..7ec4135f1
--- /dev/null
+++ b/include/mbgl/ios/MGLAccountManager.h
@@ -0,0 +1,29 @@
+#import <Foundation/Foundation.h>
+
+/** The MGLAccountManager object provides a global way to set a Mapbox API access token, as well as other settings used framework-wide. */
+@interface MGLAccountManager : NSObject
+
+/** @name Authorizing Access */
+
+/** Set the Mapbox API access token for the framework.
+*
+*   You can set an access token on MGLAccountManager or on an individual map view. The same token is used throughout the framework.
+*   @param accessToken The Mapbox API access token. */
++ (void)setAccessToken:(NSString *)accessToken;
+
+/** Retreive the Mapbox API access token for the framework.
+*
+*   You can set an access token on MGLAccountManager or on an individual map view. The same token is used throughout the framework.
+*   @return accessToken The Mapbox API access token. */
++ (NSString *)accessToken;
+
+/** @name Providing User Metrics Opt-Out */
+
+/** Certain Mapbox plans require the collection of user metrics. If you aren't using a preference switch in an existing or new `Settings.bundle` in your application, set this value to `YES` to indicate that you are providing a metrics opt-out for users within your app's interface directly.
+*   @param showsOptOut Whether your application's interface provides a user opt-out preference. The default value is `NO`, meaning a `Settings.bundle` is expected for providing a user opt-out preference. */
++ (void)setMapboxMetricsEnabledSettingShownInApp:(BOOL)showsOptOut;
+
+/** Whether in-app user metrics opt-out is configured. If set to the default value of `NO`, a user opt-out preference is expected in a `Settings.bundle` that shows in the application's section within the system Settings app. */
++ (BOOL)mapboxMetricsEnabledSettingShownInApp;
+
+@end
diff --git a/include/mbgl/ios/MGLMapView.h b/include/mbgl/ios/MGLMapView.h
index 8717b5e8a..9d7b5c901 100644
--- a/include/mbgl/ios/MGLMapView.h
+++ b/include/mbgl/ios/MGLMapView.h
@@ -20,6 +20,11 @@ IB_DESIGNABLE
 
 /** @name Initializing a Map View */
 
+/** Initialize a map view with the default style, given frame, and access token set in MapboxGL singleton.
+*   @param frame The frame with which to initialize the map view.
+*   @return An initialized map view, or `nil` if the map view was unable to be initialized. */
+- (instancetype)initWithFrame:(CGRect)frame;
+
 /** Initialize a map view with the default style and a given frame and access token.
 *   @param frame The frame with which to initialize the map view.
 *   @param accessToken A Mapbox API access token.
@@ -33,8 +38,6 @@ IB_DESIGNABLE
  *   @return An initialized map view, or `nil` if the map view was unable to be initialized. */
 - (instancetype)initWithFrame:(CGRect)frame accessToken:(NSString *)accessToken styleURL:(NSURL *)styleURL;
 
-- (instancetype)initWithFrame:(CGRect)frame __attribute__((unavailable("Instantiating an MGLMapView requires setting a style and/or an access token.")));
-
 #pragma mark - Authorizing Access
 
 /** @name Authorizing Access */
@@ -46,11 +49,6 @@ IB_DESIGNABLE
 
 /** @name Managing Constraints */
 
-/** A view controller whose top and bottom layout guides to use for proper setup of constraints in the map view internals.
-*
-*   Certain components of the map view, such as the heading compass and the data attribution button, need to be aware of the view controller layout in order to avoid positioning content under a top navigation bar or a bottom toolbar. */
-@property (nonatomic, weak) IBOutlet UIViewController *viewControllerForLayoutGuides;
-
 #pragma mark - Accessing Map Properties
 
 /** @name Accessing Map Properties */
@@ -184,13 +182,17 @@ IB_DESIGNABLE
 /** Currently active style classes, represented as an array of string identifiers. */
 @property (nonatomic) NSArray *styleClasses;
 
-/** Returns a Boolean value indicating whether the style class with the given identifier is currently active. */
+/** Returns a Boolean value indicating whether the style class with the given identifier is currently active.
+    @param styleClass The style class to query for.
+    @return Whether the style class is currently active. */
 - (BOOL)hasStyleClass:(NSString *)styleClass;
 
-/** Activates the style class with the given identifier. */
+/** Activates the style class with the given identifier.
+    @param styleClass The style class to activate. */
 - (void)addStyleClass:(NSString *)styleClass;
 
-/** Deactivates the style class with the given identifier. */
+/** Deactivates the style class with the given identifier. 
+    @param styleClass The style class to deactivate. */
 - (void)removeStyleClass:(NSString *)styleClass;
 
 #pragma mark - Annotating the Map
diff --git a/include/mbgl/ios/MGLMetricsLocationManager.h b/include/mbgl/ios/MGLMetricsLocationManager.h
deleted file mode 100644
index 5f3b56818..000000000
--- a/include/mbgl/ios/MGLMetricsLocationManager.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface MGLMetricsLocationManager : NSObject
-
-// These methods can be called from any thread.
-//
-+ (instancetype)sharedManager;
-+ (void) startUpdatingLocation;
-+ (void) stopUpdatingLocation;
-
-@end
diff --git a/include/mbgl/ios/MGLTypes.h b/include/mbgl/ios/MGLTypes.h
index 9a393b2fd..d4bc6c2ce 100644
--- a/include/mbgl/ios/MGLTypes.h
+++ b/include/mbgl/ios/MGLTypes.h
@@ -1,5 +1,7 @@
 #import <Foundation/Foundation.h>
 
+extern NSString * const MGLErrorDomain;
+
 /** The mode used to track the user location on the map. */
 typedef NS_ENUM(NSUInteger, MGLUserTrackingMode)
 {
diff --git a/include/mbgl/ios/MapboxGL.h b/include/mbgl/ios/MapboxGL.h
index c32915bc7..a6d23d328 100644
--- a/include/mbgl/ios/MapboxGL.h
+++ b/include/mbgl/ios/MapboxGL.h
@@ -1,3 +1,4 @@
+#import "MGLAccountManager.h"
 #import "MGLAnnotation.h"
 #import "MGLMapView.h"
 #import "MGLTypes.h"
diff --git a/include/mbgl/map/environment.hpp b/include/mbgl/map/environment.hpp
index 1cd33a5e6..d8068187e 100644
--- a/include/mbgl/map/environment.hpp
+++ b/include/mbgl/map/environment.hpp
@@ -39,7 +39,6 @@ public:
     // #############################################################################################
 
     // File request APIs
-    void requestAsync(const Resource&, std::function<void(const Response&)>);
     Request* request(const Resource&, std::function<void(const Response&)>);
     void cancelRequest(Request*);
 
@@ -54,11 +53,6 @@ public:
     // Only call this while the OpenGL context is exclusive to this thread.
     void performCleanup();
 
-    // #############################################################################################
-
-    // Request to terminate the environment.
-    void terminate();
-
 private:
     unsigned id;
     FileSource& fileSource;
@@ -67,9 +61,6 @@ private:
     std::vector<uint32_t> abandonedVAOs;
     std::vector<uint32_t> abandonedBuffers;
     std::vector<uint32_t> abandonedTextures;
-
-public:
-    uv_loop_t* const loop;
 };
 
 class EnvironmentScope final {
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index f9738debe..e71c5f5b4 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -1,96 +1,56 @@
 #ifndef MBGL_MAP_MAP
 #define MBGL_MAP_MAP
 
-#include <mbgl/map/transform.hpp>
 #include <mbgl/util/chrono.hpp>
 #include <mbgl/map/update.hpp>
+#include <mbgl/map/mode.hpp>
 #include <mbgl/util/geo.hpp>
-#include <mbgl/util/projection.hpp>
 #include <mbgl/util/noncopyable.hpp>
-#include <mbgl/util/ptr.hpp>
 #include <mbgl/util/vec.hpp>
 
 #include <cstdint>
-#include <atomic>
-#include <thread>
-#include <iosfwd>
-#include <set>
-#include <vector>
-#include <queue>
-#include <mutex>
-#include <condition_variable>
+#include <string>
 #include <functional>
-
-namespace uv { class async; }
+#include <vector>
+#include <memory>
 
 namespace mbgl {
 
-class Painter;
-class GlyphStore;
-class LayerDescription;
-class Sprite;
-class Style;
-class StyleLayer;
-class TexturePool;
 class FileSource;
 class View;
-class GlyphAtlas;
-class SpriteAtlas;
-class LineAtlas;
-class Environment;
-class EnvironmentScope;
-class AnnotationManager;
 class MapData;
-class Worker;
+class MapContext;
 class StillImage;
 
+namespace util {
+template <class T> class Thread;
+}
+
 class Map : private util::noncopyable {
     friend class View;
 
 public:
-    enum class Mode : uint8_t {
-        None, // we're not doing any processing
-        Continuous, // continually updating map
-        Still, // a once-off still image.
-    };
-
-    explicit Map(View&, FileSource&);
+    explicit Map(View&, FileSource&,
+                 MapMode mode = MapMode::Continuous);
     ~Map();
 
-    // Start the map render thread. It is asynchronous.
-    void start(bool startPaused = false, Mode mode = Mode::Continuous);
-    inline void start(Mode renderMode) { start(false, renderMode); }
-
-    // Stop the map render thread. This call will block until the map rendering thread stopped.
-    // The optional callback function will be invoked repeatedly until the map thread is stopped.
-    // The callback function should wait until it is woken up again by view.notify(), otherwise
-    // this will be a busy waiting loop.
-    void stop(std::function<void ()> callback = std::function<void ()>());
-
     // Pauses the render thread. The render thread will stop running but will not be terminated and will not lose state until resumed.
-    void pause(bool waitForPause = false);
+    void pause();
 
     // Resumes a paused render thread
     void resume();
 
+    // Register a callback that will get called (on the render thread) when all resources have
+    // been loaded and a complete render occurs.
     using StillImageCallback = std::function<void(std::unique_ptr<const StillImage>)>;
     void renderStill(StillImageCallback callback);
 
     // Triggers a synchronous or asynchronous render.
     void renderSync();
-
-    // Unconditionally performs a render with the current map state. May only be called from the Map
-    // thread.
-    void render();
+    void renderAsync();
 
     // Notifies the Map thread that the state has changed and an update might be necessary.
-    void triggerUpdate(Update = Update::Nothing);
-
-    // Triggers a render. Can be called from any thread.
-    void triggerRender();
-
-    // Releases resources immediately
-    void terminate();
+    void update(Update update = Update::Nothing);
 
     // Styling
     void addClass(const std::string&);
@@ -134,18 +94,23 @@ public:
     double getBearing() const;
     void resetNorth();
 
+    // Size
+    void resize(uint16_t width, uint16_t height, float ratio = 1);
+    uint16_t getWidth() const;
+    uint16_t getHeight() const;
+
     // API
     void setAccessToken(const std::string &token);
     std::string getAccessToken() const;
 
     // Projection
-    inline void getWorldBoundsMeters(ProjectedMeters &sw, ProjectedMeters &ne) const { Projection::getWorldBoundsMeters(sw, ne); }
-    inline void getWorldBoundsLatLng(LatLng &sw, LatLng &ne) const { Projection::getWorldBoundsLatLng(sw, ne); }
-    inline double getMetersPerPixelAtLatitude(const double lat, const double zoom) const { return Projection::getMetersPerPixelAtLatitude(lat, zoom); }
-    inline const ProjectedMeters projectedMetersForLatLng(const LatLng latLng) const { return Projection::projectedMetersForLatLng(latLng); }
-    inline const LatLng latLngForProjectedMeters(const ProjectedMeters projectedMeters) const { return Projection::latLngForProjectedMeters(projectedMeters); }
-    inline const vec2<double> pixelForLatLng(const LatLng latLng) const { return state.pixelForLatLng(latLng); }
-    inline const LatLng latLngForPixel(const vec2<double> pixel) const { return state.latLngForPixel(pixel); }
+    void getWorldBoundsMeters(ProjectedMeters &sw, ProjectedMeters &ne) const;
+    void getWorldBoundsLatLng(LatLng &sw, LatLng &ne) const;
+    double getMetersPerPixelAtLatitude(const double lat, const double zoom) const;
+    const ProjectedMeters projectedMetersForLatLng(const LatLng latLng) const;
+    const LatLng latLngForProjectedMeters(const ProjectedMeters projectedMeters) const;
+    const vec2<double> pixelForLatLng(const LatLng latLng) const;
+    const LatLng latLngForPixel(const vec2<double> pixel) const;
 
     // Annotations
     void setDefaultPointAnnotationSymbol(const std::string&);
@@ -160,112 +125,18 @@ public:
 
     // Memory
     void setSourceTileCacheSize(size_t);
-    size_t getSourceTileCacheSize() const { return sourceCacheSize; }
     void onLowMemory();
 
     // Debug
     void setDebug(bool value);
     void toggleDebug();
     bool getDebug() const;
-
-    inline const TransformState &getState() const { return state; }
-    TimePoint getTime() const;
-    inline AnnotationManager& getAnnotationManager() const { return *annotationManager; }
+    bool isFullyLoaded() const;
 
 private:
-    // Runs the map event loop. ONLY run this function when you want to get render a single frame
-    // with this map object. It will *not* spawn a separate thread and instead block until the
-    // frame is completely rendered.
-    void run();
-
-    // This may only be called by the View object.
-    void resize(uint16_t width, uint16_t height, float ratio = 1);
-    void resize(uint16_t width, uint16_t height, float ratio, uint16_t fbWidth, uint16_t fbHeight);
-
-    util::ptr<Sprite> getSprite();
-    Worker& getWorker();
-
-    // Checks if render thread needs to pause
-    void checkForPause();
-
-    // Setup
-    void setup();
-
-    void updateTiles();
-
-    // Triggered by triggerUpdate();
-    void update();
-
-    // Loads the style set in the data object. Called by Update::StyleInfo
-    void reloadStyle();
-    void loadStyleJSON(const std::string& json, const std::string& base);
-
-    // Prepares a map render by updating the tiles we need for the current view, as well as updating
-    // the stylesheet.
-    void prepare();
-
-    // Runs the function in the map thread.
-    void invokeTask(std::function<void()>&&);
-    template <typename Fn> auto invokeSyncTask(const Fn& fn) -> decltype(fn());
-
-    void processTasks();
-
-    void updateAnnotationTiles(const std::vector<TileID>&);
-
-    size_t sourceCacheSize;
-
-    Mode mode = Mode::None;
-
-    const std::unique_ptr<Environment> env;
-    std::unique_ptr<EnvironmentScope> scope;
-    View &view;
-
-private:
-    std::unique_ptr<Worker> workers;
-    std::thread thread;
-    std::unique_ptr<uv::async> asyncTerminate;
-    std::unique_ptr<uv::async> asyncUpdate;
-    std::unique_ptr<uv::async> asyncInvoke;
-    std::unique_ptr<uv::async> asyncRender;
-
-    bool terminating = false;
-    bool pausing = false;
-    bool isPaused = false;
-    std::mutex mutexRun;
-    std::condition_variable condRun;
-    std::mutex mutexPause;
-    std::condition_variable condPause;
-
-    // Used to signal that rendering completed.
-    bool rendered = false;
-    std::condition_variable condRendered;
-    std::mutex mutexRendered;
-
-    // Stores whether the map thread has been stopped already.
-    std::atomic_bool isStopped;
-
-    Transform transform;
-    TransformState state;
-
-    FileSource& fileSource;
-
-    util::ptr<Style> style;
-    std::unique_ptr<GlyphAtlas> glyphAtlas;
-    util::ptr<GlyphStore> glyphStore;
-    std::unique_ptr<SpriteAtlas> spriteAtlas;
-    util::ptr<Sprite> sprite;
-    std::unique_ptr<LineAtlas> lineAtlas;
-    util::ptr<TexturePool> texturePool;
-    std::unique_ptr<Painter> painter;
-    std::unique_ptr<AnnotationManager> annotationManager;
-
     const std::unique_ptr<MapData> data;
-
-    std::atomic<UpdateType> updated;
-
-    std::mutex mutexTask;
-    std::queue<std::function<void()>> tasks;
-    StillImageCallback callback;
+    const std::unique_ptr<util::Thread<MapContext>> context;
+    bool paused = false;
 };
 
 }
diff --git a/include/mbgl/map/mode.hpp b/include/mbgl/map/mode.hpp
new file mode 100644
index 000000000..4ade870d9
--- /dev/null
+++ b/include/mbgl/map/mode.hpp
@@ -0,0 +1,15 @@
+#ifndef MBGL_MAP_MODE
+#define MBGL_MAP_MODE
+
+#include <cstdint>
+
+namespace mbgl {
+
+enum class MapMode : uint8_t {
+    Continuous, // continually updating map
+    Still, // a once-off still image
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/include/mbgl/map/update.hpp b/include/mbgl/map/update.hpp
index 727122af6..b4c6b5f13 100644
--- a/include/mbgl/map/update.hpp
+++ b/include/mbgl/map/update.hpp
@@ -9,8 +9,6 @@ using UpdateType = uint32_t;
 
 enum class Update : UpdateType {
     Nothing                   = 0,
-    StyleInfo                 = 1 << 0,
-    Debug                     = 1 << 1,
     DefaultTransitionDuration = 1 << 2,
     Classes                   = 1 << 3,
     Zoom                      = 1 << 4,
diff --git a/include/mbgl/map/view.hpp b/include/mbgl/map/view.hpp
index 8e21233b7..41d57bdc9 100644
--- a/include/mbgl/map/view.hpp
+++ b/include/mbgl/map/view.hpp
@@ -2,6 +2,7 @@
 #define MBGL_MAP_VIEW
 
 #include <mbgl/util/chrono.hpp>
+#include <functional>
 
 #include <memory>
 
@@ -39,13 +40,13 @@ public:
 
     virtual void notify() = 0;
 
-    // Called from the render thread. The implementation must trigger a rerender.
-    // (i.e. map->renderSync() or map->renderAsync() must be called as a result of this)
-    virtual void invalidate() = 0;
+    // Called from the render thread. The implementation should resize the framebuffer.
+    virtual void resize(uint16_t width, uint16_t height, float pixelRatio);
 
-    // Called from the render (=GL) thread. Signals that the contents of the contents
-    // may be discarded. The default is a no-op.
-    virtual void discard();
+    // Called from the render thread. The implementation must trigger a rerender.
+    // (i.e. either the passed render() function for rendering immediately on the map thread,
+    // or map->renderSync() from the main thread must be called as a result of this)
+    virtual void invalidate(std::function<void()> render) = 0;
 
     // Reads the pixel data from the current framebuffer. If your View implementation
     // doesn't support reading from the framebuffer, return a null pointer.
@@ -58,10 +59,6 @@ public:
         MapChange change,
         Duration delay = Duration::zero());
 
-protected:
-    // Resizes the view
-    void resize(uint16_t width, uint16_t height, float ratio, uint16_t fbWidth, uint16_t fbHeight);
-
 protected:
     mbgl::Map *map = nullptr;
 };
diff --git a/include/mbgl/platform/default/glfw_view.hpp b/include/mbgl/platform/default/glfw_view.hpp
index 234568e4b..74dc6fe43 100644
--- a/include/mbgl/platform/default/glfw_view.hpp
+++ b/include/mbgl/platform/default/glfw_view.hpp
@@ -17,7 +17,7 @@ public:
     void activate() override;
     void deactivate() override;
     void notify() override;
-    void invalidate() override;
+    void invalidate(std::function<void()> render) override;
 
     static void onKey(GLFWwindow *window, int key, int scancode, int action, int mods);
     static void onScroll(GLFWwindow *window, double xoffset, double yoffset);
@@ -25,19 +25,28 @@ public:
     static void onMouseClick(GLFWwindow *window, int button, int action, int modifiers);
     static void onMouseMove(GLFWwindow *window, double x, double y);
 
-    int run();
+    // Callback called when the user presses the key mapped to style change.
+    // The expected action is to set a new style, different to the current one.
+    void setChangeStyleCallback(std::function<void()> callback);
+
+    void setShouldClose();
+
+    void setWindowTitle(const std::string&);
+
+    void run();
     void fps();
 
-public:
+private:
     bool fullscreen = false;
-
-    double lastX = 0, lastY = 0;
     bool tracking = false;
-
     bool rotating = false;
 
+    double lastX = 0, lastY = 0;
+
     double lastClick = -1;
 
+    std::function<void()> changeStyleCallback;
+
     GLFWwindow *window = nullptr;
 };
 
diff --git a/include/mbgl/platform/default/headless_view.hpp b/include/mbgl/platform/default/headless_view.hpp
index 3262afc46..66f13cf5b 100644
--- a/include/mbgl/platform/default/headless_view.hpp
+++ b/include/mbgl/platform/default/headless_view.hpp
@@ -17,6 +17,7 @@ typedef XID GLXPbuffer;
 #include <mbgl/platform/gl.hpp>
 
 #include <memory>
+#include <thread>
 
 namespace mbgl {
 
@@ -28,13 +29,11 @@ public:
     HeadlessView(std::shared_ptr<HeadlessDisplay> display, uint16_t width = 256, uint16_t height = 256, float pixelRatio = 1);
     ~HeadlessView();
 
-    void resize(uint16_t width, uint16_t height, float pixelRatio);
-
     void activate() override;
     void deactivate() override;
     void notify() override;
-    void invalidate() override;
-    void discard() override;
+    void resize(uint16_t width, uint16_t height, float pixelRatio) override;
+    void invalidate(std::function<void()> render) override;
     std::unique_ptr<StillImage> readStillImage() override;
 
 private:
@@ -56,12 +55,7 @@ private:
         float pixelRatio = 0;
     };
 
-    // These are the values that represent the state of the current framebuffer.
-    Dimensions current;
-
-    // These are the values that will be used after the next discard() event.
-    std::mutex prospectiveMutex;
-    Dimensions prospective;
+    Dimensions dimensions;
 
 #if MBGL_USE_CGL
     CGLContextObj glContext = nullptr;
diff --git a/include/mbgl/platform/default/jpeg_reader.hpp b/include/mbgl/platform/default/jpeg_reader.hpp
index e041c0a5d..3e64ce291 100644
--- a/include/mbgl/platform/default/jpeg_reader.hpp
+++ b/include/mbgl/platform/default/jpeg_reader.hpp
@@ -10,10 +10,9 @@ extern "C"
 }
 
 #pragma GCC diagnostic push
-#ifndef __clang__
+#pragma GCC diagnostic ignored "-Wunknown-pragmas"
 #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
 #pragma GCC diagnostic ignored "-Wshadow"
-#endif
 #include <boost/iostreams/stream.hpp>
 #pragma GCC diagnostic pop
 
diff --git a/include/mbgl/platform/default/png_reader.hpp b/include/mbgl/platform/default/png_reader.hpp
index 649e7a75c..5cbbc51e7 100644
--- a/include/mbgl/platform/default/png_reader.hpp
+++ b/include/mbgl/platform/default/png_reader.hpp
@@ -12,10 +12,9 @@ extern "C"
 #include <memory>
 
 #pragma GCC diagnostic push
-#ifndef __clang__
+#pragma GCC diagnostic ignored "-Wunknown-pragmas"
 #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
 #pragma GCC diagnostic ignored "-Wshadow"
-#endif
 #include <boost/iostreams/stream.hpp>
 #pragma GCC diagnostic pop
 
diff --git a/include/mbgl/platform/gl.hpp b/include/mbgl/platform/gl.hpp
index 61701a438..73f0801fa 100644
--- a/include/mbgl/platform/gl.hpp
+++ b/include/mbgl/platform/gl.hpp
@@ -3,6 +3,7 @@
 
 #include <string>
 #include <stdexcept>
+#include <vector>
 
 #if __APPLE__
     #include "TargetConditionals.h"
@@ -39,150 +40,42 @@ struct Error : ::std::runtime_error {
 void checkError(const char *cmd, const char *file, int line);
 
 #if defined(DEBUG)
-#define MBGL_CHECK_ERROR(cmd) ([&]() { struct _ { inline ~_() { ::mbgl::gl::checkError(#cmd, __FILE__, __LINE__); } } _; return cmd; }())
+#define MBGL_CHECK_ERROR(cmd) ([&]() { struct __MBGL_C_E { inline ~__MBGL_C_E() { ::mbgl::gl::checkError(#cmd, __FILE__, __LINE__); } } __MBGL_C_E; return cmd; }())
 #else
 #define MBGL_CHECK_ERROR(cmd) (cmd)
 #endif
 
-// GL_KHR_debug / GL_ARB_debug_output
-#define GL_DEBUG_OUTPUT_SYNCHRONOUS       0x8242
-#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243
-#define GL_DEBUG_CALLBACK_FUNCTION        0x8244
-#define GL_DEBUG_CALLBACK_USER_PARAM      0x8245
-#define GL_DEBUG_SOURCE_API               0x8246
-#define GL_DEBUG_SOURCE_WINDOW_SYSTEM     0x8247
-#define GL_DEBUG_SOURCE_SHADER_COMPILER   0x8248
-#define GL_DEBUG_SOURCE_THIRD_PARTY       0x8249
-#define GL_DEBUG_SOURCE_APPLICATION       0x824A
-#define GL_DEBUG_SOURCE_OTHER             0x824B
-#define GL_DEBUG_TYPE_ERROR               0x824C
-#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D
-#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR  0x824E
-#define GL_DEBUG_TYPE_PORTABILITY         0x824F
-#define GL_DEBUG_TYPE_PERFORMANCE         0x8250
-#define GL_DEBUG_TYPE_OTHER               0x8251
-#define GL_MAX_DEBUG_MESSAGE_LENGTH       0x9143
-#define GL_MAX_DEBUG_LOGGED_MESSAGES      0x9144
-#define GL_DEBUG_LOGGED_MESSAGES          0x9145
-#define GL_DEBUG_SEVERITY_HIGH            0x9146
-#define GL_DEBUG_SEVERITY_MEDIUM          0x9147
-#define GL_DEBUG_SEVERITY_LOW             0x9148
-#define GL_DEBUG_TYPE_MARKER              0x8268
-#define GL_DEBUG_TYPE_PUSH_GROUP          0x8269
-#define GL_DEBUG_TYPE_POP_GROUP           0x826A
-#define GL_DEBUG_SEVERITY_NOTIFICATION    0x826B
-#define GL_MAX_DEBUG_GROUP_STACK_DEPTH    0x826C
-#define GL_DEBUG_GROUP_STACK_DEPTH        0x826D
-#define GL_BUFFER                         0x82E0
-#define GL_SHADER                         0x82E1
-#define GL_PROGRAM                        0x82E2
-#define GL_QUERY                          0x82E3
-#define GL_PROGRAM_PIPELINE               0x82E4
-#define GL_SAMPLER                        0x82E6
-#define GL_MAX_LABEL_LENGTH               0x82E8
-#define GL_DEBUG_OUTPUT                   0x92E0
-#define GL_CONTEXT_FLAG_DEBUG_BIT         0x00000002
-#define GL_DISPLAY_LIST                   0x82E7
-#define GL_VERTEX_ARRAY                   0x8074
-#define GL_TRANSFORM_FEEDBACK             0x8E22
-#define GL_TEXTURE                        0x1702
-#define GL_RENDERBUFFER                   0x8D41
-#define GL_FRAMEBUFFER                    0x8D40
-typedef void (* GLDEBUGPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam);
-typedef void (* PFNGLDEBUGMESSAGECONTROLPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
-typedef void (* PFNGLDEBUGMESSAGEINSERTPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
-typedef void (* PFNGLDEBUGMESSAGECALLBACKPROC) (GLDEBUGPROC callback, const void *userParam);
-typedef GLuint (* PFNGLGETDEBUGMESSAGELOGPROC) (GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
-typedef void (* PFNGLGETPOINTERVPROC) (GLenum pname, void **params);
-typedef void (* PFNGLPUSHDEBUGGROUPPROC) (GLenum source, GLuint id, GLsizei length, const GLchar *message);
-typedef void (* PFNGLPOPDEBUGGROUPPROC) (void);
-typedef void (* PFNGLOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
-typedef void (* PFNGLGETOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
-typedef void (* PFNGLOBJECTPTRLABELPROC) (const void *ptr, GLsizei length, const GLchar *label);
-typedef void (* PFNGLGETOBJECTPTRLABELPROC) (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
-extern PFNGLDEBUGMESSAGECONTROLPROC DebugMessageControl;
-extern PFNGLDEBUGMESSAGEINSERTPROC DebugMessageInsert;
-extern PFNGLDEBUGMESSAGECALLBACKPROC DebugMessageCallback;
-extern PFNGLGETDEBUGMESSAGELOGPROC GetDebugMessageLog;
-extern PFNGLGETPOINTERVPROC GetPointerv;
-extern PFNGLPUSHDEBUGGROUPPROC PushDebugGroup;
-extern PFNGLPOPDEBUGGROUPPROC PopDebugGroup;
-extern PFNGLOBJECTLABELPROC ObjectLabel;
-extern PFNGLGETOBJECTLABELPROC GetObjectLabel;
-extern PFNGLOBJECTPTRLABELPROC ObjectPtrLabel;
-extern PFNGLGETOBJECTPTRLABELPROC GetObjectPtrLabel;
-void debug_callback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam);
-
-// GL_EXT_debug_marker
-typedef void (* PFNGLINSERTEVENTMARKEREXTPROC) (GLsizei length, const GLchar *marker);
-typedef void (* PFNGLPUSHGROUPMARKEREXTPROC) (GLsizei length, const GLchar *marker);
-typedef void (* PFNGLPOPGROUPMARKEREXTPROC) (void);
-extern PFNGLINSERTEVENTMARKEREXTPROC InsertEventMarkerEXT;
-extern PFNGLPUSHGROUPMARKEREXTPROC PushGroupMarkerEXT;
-extern PFNGLPOPGROUPMARKEREXTPROC PopGroupMarkerEXT;
-
-// GL_EXT_debug_label
-#define GL_PROGRAM_PIPELINE_OBJECT_EXT    0x8A4F
-#define GL_PROGRAM_OBJECT_EXT             0x8B40
-#define GL_SHADER_OBJECT_EXT              0x8B48
-#define GL_BUFFER_OBJECT_EXT              0x9151
-#define GL_QUERY_OBJECT_EXT               0x9153
-#define GL_VERTEX_ARRAY_OBJECT_EXT        0x9154
-typedef void (* PFNGLLABELOBJECTEXTPROC) (GLenum type, GLuint object, GLsizei length, const GLchar *label);
-typedef void (* PFNGLGETOBJECTLABELEXTPROC) (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label);
-extern PFNGLLABELOBJECTEXTPROC LabelObjectEXT;
-extern PFNGLGETOBJECTLABELEXTPROC GetObjectLabelEXT;
-
-// GL_ARB_vertex_array_object / GL_OES_vertex_array_object
-#define GL_VERTEX_ARRAY_BINDING 0x85B5
-typedef void (* PFNGLBINDVERTEXARRAYPROC) (GLuint array);
-typedef void (* PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint* arrays);
-typedef void (* PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint* arrays);
-typedef GLboolean (* PFNGLISVERTEXARRAYPROC) (GLuint array);
-extern PFNGLBINDVERTEXARRAYPROC BindVertexArray;
-extern PFNGLDELETEVERTEXARRAYSPROC DeleteVertexArrays;
-extern PFNGLGENVERTEXARRAYSPROC GenVertexArrays;
-extern PFNGLISVERTEXARRAYPROC IsVertexArray;
-
-// GL_EXT_packed_depth_stencil / GL_OES_packed_depth_stencil
-extern bool isPackedDepthStencilSupported;
-#define GL_DEPTH24_STENCIL8 0x88F0
-
-// GL_OES_depth24
-extern bool isDepth24Supported;
-#define GL_DEPTH_COMPONENT24 0x81A6
-
-// Debug group markers, useful for debugging on iOS
-#if defined(DEBUG)
-// static int indent = 0;
-inline void start_group(const std::string &str) {
-    if (gl::PushDebugGroup != nullptr) {
-        MBGL_CHECK_ERROR(gl::PushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, GLsizei(str.size()), str.c_str()));
-    } else if (gl::PushGroupMarkerEXT != nullptr) {
-        MBGL_CHECK_ERROR(gl::PushGroupMarkerEXT(GLsizei(str.size()), str.c_str()));
-    }
-    // fprintf(stderr, "%s%s\n", std::string(indent * 4, ' ').c_str(), str.c_str());
-    // indent++;
-}
-
-inline void end_group() {
-    if (gl::PopDebugGroup != nullptr) {
-        MBGL_CHECK_ERROR(gl::PopDebugGroup());
-    } else if (gl::PopGroupMarkerEXT != nullptr) {
-        MBGL_CHECK_ERROR(gl::PopGroupMarkerEXT());
-    }
-    // indent--;
-}
-#else
-inline void start_group(const std::string &) {}
-inline void end_group() {}
-#endif
-
-struct group {
-    inline group(const std::string &str) { start_group(str); }
-    ~group() { end_group(); };
+class ExtensionFunctionBase {
+public:
+    static std::vector<ExtensionFunctionBase*>& functions();
+    typedef std::pair<const char *, const char *> Probe;
+    std::vector<Probe> probes;
+    void (*ptr)();
 };
 
+template <class>
+class ExtensionFunction;
+
+template <class R, class... Args>
+class ExtensionFunction<R (Args...)> : protected ExtensionFunctionBase {
+public:
+    ExtensionFunction(std::initializer_list<Probe> probes_) {
+        probes = probes_;
+        ExtensionFunctionBase::functions().push_back(this);
+    }
+
+    explicit operator bool() const {
+        return ptr;
+    }
+
+    R operator()(Args... args) const {
+        return (*reinterpret_cast<R (*)(Args...)>(ptr))(std::forward<Args>(args)...);
+    }
+};
+
+using glProc = void (*)();
+void InitializeExtensions(glProc (*getProcAddress)(const char *));
+
 }
 }
 
diff --git a/include/mbgl/platform/platform.hpp b/include/mbgl/platform/platform.hpp
index cd87e2256..f828af37f 100644
--- a/include/mbgl/platform/platform.hpp
+++ b/include/mbgl/platform/platform.hpp
@@ -21,6 +21,9 @@ const std::string &applicationRoot();
 // Returns the path to the asset location.
 const std::string &assetRoot();
 
+// Makes the current thread low priority.
+void makeThreadLowPriority();
+
 // Shows an alpha image with the specified dimensions in a named window.
 void showDebugImage(std::string name, const char *data, size_t width, size_t height);
 
diff --git a/include/mbgl/storage/default_file_source.hpp b/include/mbgl/storage/default_file_source.hpp
index f39374716..405b04a49 100644
--- a/include/mbgl/storage/default_file_source.hpp
+++ b/include/mbgl/storage/default_file_source.hpp
@@ -16,12 +16,8 @@ public:
     ~DefaultFileSource() override;
 
     // FileSource API
-    Request *request(const Resource &resource, uv_loop_t *loop, const Environment &env,
-                     Callback callback) override;
-    void cancel(Request *request) override;
-    void request(const Resource &resource, const Environment &env, Callback callback) override;
-
-    void abort(const Environment &env) override;
+    Request* request(const Resource&, uv_loop_t*, Callback) override;
+    void cancel(Request*) override;
 
 public:
     class Impl;
diff --git a/include/mbgl/storage/file_source.hpp b/include/mbgl/storage/file_source.hpp
index 30e88c39f..7c6e578a9 100644
--- a/include/mbgl/storage/file_source.hpp
+++ b/include/mbgl/storage/file_source.hpp
@@ -15,7 +15,6 @@ typedef struct uv_loop_s uv_loop_t;
 namespace mbgl {
 
 class Request;
-class Environment;
 
 class FileSource : private util::noncopyable {
 protected:
@@ -28,19 +27,8 @@ public:
 
     // These can be called from any thread. The callback will be invoked in the loop.
     // You can only cancel a request from the same thread it was created in.
-    virtual Request *request(const Resource &resource, uv_loop_t *loop, const Environment &env,
-                             Callback callback) = 0;
-    virtual void cancel(Request *request) = 0;
-
-    // These can be called from any thread. The callback will be invoked in an arbitrary other thread.
-    // You cannot cancel these requests.
-    virtual void request(const Resource &resource, const Environment &env, Callback callback) = 0;
-
-    // This can be called from any thread. All requests with the environment pointer env should be
-    // notified as errored. Note that this is /different/ from canceling requests; a canceled
-    // request's callback is never called, while an aborted request's callback is called with
-    // a error message.
-    virtual void abort(const Environment &env) = 0;
+    virtual Request* request(const Resource&, uv_loop_t*, Callback) = 0;
+    virtual void cancel(Request*) = 0;
 };
 
 }
diff --git a/include/mbgl/storage/request.hpp b/include/mbgl/storage/request.hpp
index 00157329b..4b75f23f6 100644
--- a/include/mbgl/storage/request.hpp
+++ b/include/mbgl/storage/request.hpp
@@ -11,20 +11,17 @@
 #include <functional>
 #include <memory>
 
-typedef struct uv_async_s uv_async_t;
 typedef struct uv_loop_s uv_loop_t;
+namespace uv { class async; }
 
 namespace mbgl {
 
 class Response;
-class Environment;
 
 class Request : private util::noncopyable {
-    MBGL_STORE_THREAD(tid)
-
 public:
     using Callback = std::function<void(const Response &)>;
-    Request(const Resource &resource, uv_loop_t *loop, const Environment &env, Callback callback);
+    Request(const Resource &resource, uv_loop_t *loop, Callback callback);
 
 public:
     // May be called from any thread.
@@ -40,7 +37,7 @@ private:
     void notifyCallback();
 
 private:
-    uv_async_t *async = nullptr;
+    std::unique_ptr<uv::async> async;
     struct Canceled;
     std::unique_ptr<Canceled> canceled;
     Callback callback;
@@ -48,11 +45,6 @@ private:
 
 public:
     const Resource resource;
-
-    // The environment ref is used to associate requests with a particular environment. This allows
-    // us to only terminate requests associated with that environment, e.g. when the map the env
-    // belongs to is discarded.
-    const Environment &env;
 };
 
 }
diff --git a/include/mbgl/storage/sqlite_cache.hpp b/include/mbgl/storage/sqlite_cache.hpp
index b216f74d7..fd67d48bb 100644
--- a/include/mbgl/storage/sqlite_cache.hpp
+++ b/include/mbgl/storage/sqlite_cache.hpp
@@ -20,8 +20,9 @@ public:
     void get(const Resource &resource, Callback callback) override;
     void put(const Resource &resource, std::shared_ptr<const Response> response, Hint hint) override;
 
-private:
     class Impl;
+
+private:
     const std::unique_ptr<util::Thread<Impl>> thread;
 };
 
diff --git a/include/mbgl/util/async_queue.hpp b/include/mbgl/util/async_queue.hpp
deleted file mode 100644
index b3eaabc31..000000000
--- a/include/mbgl/util/async_queue.hpp
+++ /dev/null
@@ -1,95 +0,0 @@
-#ifndef MBGL_UTIL_ASYNC_QUEUE
-#define MBGL_UTIL_ASYNC_QUEUE
-
-#include "std.hpp"
-
-#include <uv.h>
-
-#include <thread>
-#include <mutex>
-#include <functional>
-#include <queue>
-#include <string>
-
-
-#if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10
-#define UV_ASYNC_PARAMS(handle) uv_async_t *handle, int
-#else
-#define UV_ASYNC_PARAMS(handle) uv_async_t *handle
-#endif
-
-namespace mbgl {
-namespace util {
-
-template <typename T>
-class AsyncQueue {
-public:
-    AsyncQueue(uv_loop_t *loop, std::function<void(T &)> fn) :
-          callback(fn) {
-        async.data = this;
-        uv_async_init(loop, &async, [](UV_ASYNC_PARAMS(handle)) {
-            auto q = reinterpret_cast<AsyncQueue *>(handle->data);
-            q->process();
-        });
-    }
-
-    void send(T &&data) {
-        {
-            std::lock_guard<std::mutex> lock(mutex);
-            queue.push(util::make_unique<T>(std::move(data)));
-        }
-        uv_async_send(&async);
-    }
-
-    void send(std::unique_ptr<T> data) {
-        {
-            std::lock_guard<std::mutex> lock(mutex);
-            queue.push(std::move(data));
-        }
-        uv_async_send(&async);
-    }
-
-    void stop() {
-        uv_close((uv_handle_t *)&async, [](uv_handle_t *handle) {
-            delete reinterpret_cast<AsyncQueue *>(handle->data);
-        });
-    }
-
-    void ref() {
-        uv_ref((uv_handle_t *)&async);
-    }
-
-    void unref() {
-        uv_unref((uv_handle_t *)&async);
-    }
-
-private:
-    ~AsyncQueue() {
-    }
-
-    void process() {
-        std::unique_ptr<T> item;
-        while (true) {
-            mutex.lock();
-            if (queue.empty()) {
-                mutex.unlock();
-                break;
-            }
-            item = std::move(queue.front());
-            queue.pop();
-            mutex.unlock();
-            callback(*item);
-        }
-    }
-
-private:
-    std::mutex mutex;
-    uv_async_t async;
-    std::queue<std::unique_ptr<T>> queue;
-    std::function<void(T &)> callback;
-};
-
-}
-}
-
-#endif
diff --git a/include/mbgl/util/constants.hpp b/include/mbgl/util/constants.hpp
index e598806c2..bb5aad2af 100644
--- a/include/mbgl/util/constants.hpp
+++ b/include/mbgl/util/constants.hpp
@@ -3,6 +3,7 @@
 
 #include <cmath>
 #include <string>
+#include <vector>
 
 namespace mbgl {
 
diff --git a/include/mbgl/util/gl_helper.hpp b/include/mbgl/util/gl_helper.hpp
new file mode 100644
index 000000000..cf007e8a6
--- /dev/null
+++ b/include/mbgl/util/gl_helper.hpp
@@ -0,0 +1,87 @@
+#ifndef MBGL_UTIL_GL_HELPER
+#define MBGL_UTIL_GL_HELPER
+
+#include <mbgl/platform/gl.hpp>
+
+#include <array>
+
+namespace {
+
+template <typename T, T (*Create)(), void (*Destroy)(const T&)>
+class Preserve {
+public:
+    Preserve() : data(Create()) {}
+    ~Preserve() { Destroy(data); }
+
+private:
+    const T data;
+};
+
+inline bool getBlend() {
+    return glIsEnabled(GL_BLEND);
+}
+
+inline void setBlend(const bool& enabled) {
+    enabled ? MBGL_CHECK_ERROR(glEnable(GL_BLEND)) : MBGL_CHECK_ERROR(glDisable(GL_BLEND));
+}
+
+inline std::array<double, 4> getClearColor() {
+    std::array<double, 4> color;
+    MBGL_CHECK_ERROR(glGetDoublev(GL_COLOR_CLEAR_VALUE, color.data()));
+    return color;
+}
+
+inline void setClearColor(const std::array<double, 4>& color) {
+    MBGL_CHECK_ERROR(glClearColor(color[0], color[1], color[2], color[3]));
+}
+
+
+inline std::array<GLenum, 2> getBlendFunc() {
+    GLint func[2];
+    glGetIntegerv(GL_BLEND_SRC, &func[0]);
+    glGetIntegerv(GL_BLEND_DST, &func[1]);
+    return {{ static_cast<GLenum>(func[0]), static_cast<GLenum>(func[1]) }};
+}
+
+inline void setBlendFunc(const std::array<GLenum, 2>& func) {
+    MBGL_CHECK_ERROR(glBlendFunc(func[0], func[1]));
+}
+
+
+inline std::array<double, 2> getPixelZoom() {
+    std::array<double, 2> zoom;
+    glGetDoublev(GL_ZOOM_X, &zoom[0]);
+    glGetDoublev(GL_ZOOM_Y, &zoom[1]);
+    return zoom;
+}
+
+inline void setPixelZoom(const std::array<double, 2>& func) {
+    MBGL_CHECK_ERROR(glPixelZoom(func[0], func[1]));
+}
+
+
+inline std::array<double, 4> getRasterPos() {
+    std::array<double, 4> pos;
+    MBGL_CHECK_ERROR(glGetDoublev(GL_CURRENT_RASTER_POSITION, pos.data()));
+    return pos;
+}
+
+inline void setRasterPos(const std::array<double, 4>& pos) {
+    MBGL_CHECK_ERROR(glRasterPos4d(pos[0], pos[1], pos[2], pos[3]));
+}
+
+} // end anonymous namespace
+
+namespace mbgl {
+namespace gl {
+
+using PreserveBlend = Preserve<bool, getBlend, setBlend>;
+using PreserveClearColor = Preserve<std::array<double, 4>, getClearColor, setClearColor>;
+using PreserveBlendFunc = Preserve<std::array<GLenum, 2>, getBlendFunc, setBlendFunc>;
+using PreservePixelZoom = Preserve<std::array<double, 2>, getPixelZoom, setPixelZoom>;
+using PreserveRasterPos = Preserve<std::array<double, 4>, getRasterPos, setRasterPos>;
+
+}
+}
+
+#endif
diff --git a/include/mbgl/util/math.hpp b/include/mbgl/util/math.hpp
index 6dea628e9..5fcf3dce8 100644
--- a/include/mbgl/util/math.hpp
+++ b/include/mbgl/util/math.hpp
@@ -100,7 +100,11 @@ inline T mag(const S& a) {
 
 template <typename S>
 inline S unit(const S& a) {
-    return a * (1 / mag(a));
+    auto magnitude = mag(a);
+    if (magnitude == 0) {
+        return a;
+    }
+    return a * (1 / magnitude);
 }
 
 template <typename T>
diff --git a/include/mbgl/util/string.hpp b/include/mbgl/util/string.hpp
index 690a67d47..672ead244 100644
--- a/include/mbgl/util/string.hpp
+++ b/include/mbgl/util/string.hpp
@@ -4,9 +4,8 @@
 #include <string>
 
 #pragma GCC diagnostic push
-#ifndef __clang__
+#pragma GCC diagnostic ignored "-Wunknown-pragmas"
 #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
-#endif
 #include <boost/lexical_cast.hpp>
 #pragma GCC diagnostic pop
 
diff --git a/ios/MapboxGL.podspec b/ios/MapboxGL.podspec
index 57de3f6f3..67bcc9571 100644
--- a/ios/MapboxGL.podspec
+++ b/ios/MapboxGL.podspec
@@ -1,15 +1,16 @@
 Pod::Spec.new do |m|
 
   m.name    = 'MapboxGL'
-  m.version = '0.2.15'
+  m.version = '0.3.1'
 
   m.summary          = 'Open source vector map solution for iOS with full styling capabilities.'
   m.description      = 'Open source OpenGL-based vector map solution for iOS with full styling capabilities and Cocoa bindings.'
-  m.homepage         = 'https://www.mapbox.com/blog/mapbox-gl/'
+  m.homepage         = 'https://www.mapbox.com/mapbox-gl-ios/'
   m.license          = 'BSD'
   m.author           = { 'Mapbox' => 'mobile@mapbox.com' }
   m.screenshot       = 'https://raw.githubusercontent.com/mapbox/mapbox-gl-native/master/ios/screenshot.png'
   m.social_media_url = 'https://twitter.com/mapbox'
+  m.documentation_url = 'https://www.mapbox.com/mapbox-gl-ios'
 
   m.source = {
     :http => "http://mapbox.s3.amazonaws.com/mapbox-gl-native/ios/builds/mapbox-gl-ios-#{m.version.to_s}.zip",
@@ -22,11 +23,10 @@ Pod::Spec.new do |m|
   m.requires_arc = true
 
   m.preserve_paths = '**'
-  m.source_files = 'Headers/*.h'
+  m.source_files = 'Headers/*.h', 'MGLDummy.m'
   m.resource_bundle = { 'MapboxGL' => 'MapboxGL.bundle/*' }
   m.vendored_library = 'libMapboxGL.a'
 
-
   m.frameworks = 'CoreLocation', 'CoreTelephony', 'GLKit', 'ImageIO', 'MobileCoreServices', 'QuartzCore', 'SystemConfiguration'
   m.libraries = 'c++', 'sqlite3', 'z'
   m.xcconfig = { 'OTHER_CPLUSPLUSFLAGS' => '-std=gnu++11 -stdlib=libc++' }
diff --git a/ios/README.md b/ios/README.md
index 2af03691e..4c387f322 100644
--- a/ios/README.md
+++ b/ios/README.md
@@ -1,68 +1,7 @@
 # Mapbox GL for iOS
 
-Use or edit this project to get access to vector maps (via [Mapbox Vector Tiles](https://www.mapbox.com/blog/vector-tiles)) and dynamic OpenGL-based styling in your iOS apps by using `MGLMapView`. 
+An open source OpenGL-based vector map solution for iOS with full styling capabilities and Cocoa bindings.
 
-![](./screenshot.png)
+For more information, check out [our online overview](https://www.mapbox.com/mapbox-gl-ios/). 
 
-## Installation
-
-Currently in flux. See the parent `mapbox-gl-native` project `README` for details on building this library yourself. 
-
-Static and dynamic prebuilt binaries are coming back, as is CocoaPods support. 
-
-## Example usage
-
-### Objective-C
-
-```objective-c
-MGLMapView *mapView = [[MGLMapView alloc] initWithFrame:CGRectMake(0, 0, 400, 400)
-                                            accessToken:@"<access token string>"];
-
-[mapView setCenterCoordinate:CLLocationCoordinate2DMake(28.369334, -80.743779) 
-                   zoomLevel:13 
-                    animated:NO];
-
-[mapView useBundledStyleNamed:@"outdoors"];
-
-[self.view addSubview:mapView];
-```
-
-### Swift
-
-```swift
-let mapView = MGLMapView(frame: CGRect(x: 0, y: 0, width: 400, height: 400),
-                         accessToken: "<access token string>")
-
-mapView.setCenterCoordinate(CLLocationCoordinate2D(latitude: 46.049900, longitude: -122.095678),
-        zoomLevel: 12,
-        animated: false)
-
-mapView.useBundledStyleNamed("outdoors")
-
-view.addSubview(mapView)
-```
-
-## Development
-
-If you'd like to contribute to this project, go up to [Mapbox GL native](https://github.com/mapbox/mapbox-gl-native) and clone the project. 
-
-## Testing
-
-Currently in flux and not functioning. 
-
-## Requirements
-
- * iOS 7+
- * a sense of adventure
-
-## Styling
-
-See the [online style reference](https://www.mapbox.com/mapbox-gl-style-spec/) for the latest documentation. Contained within the `MapboxGL.bundle` assets are a couple of starter styles in JSON format. 
-
-The project will eventually get a programmatic styling API as well. 
-
-## Related Projects
-
- * https://github.com/mapbox/mapbox-gl-style-spec
- * https://github.com/mapbox/mapbox-gl-js
- * https://github.com/mapbox/vector-tile-spec
+![](https://raw.githubusercontent.com/mapbox/mapbox-gl-native/master/ios/screenshot.png)
diff --git a/ios/app/MBXAppDelegate.m b/ios/app/MBXAppDelegate.m
index f2ef69ec6..dc0410508 100644
--- a/ios/app/MBXAppDelegate.m
+++ b/ios/app/MBXAppDelegate.m
@@ -1,11 +1,30 @@
 #import "MBXAppDelegate.h"
 #import "MBXViewController.h"
-#import <mbgl/ios/MGLMapboxEvents.h>
+#import <mbgl/ios/MapboxGL.h>
 
 @implementation MBXAppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
+    // Set Access Token
+    NSString *accessToken = [[NSProcessInfo processInfo] environment][@"MAPBOX_ACCESS_TOKEN"];
+    if (accessToken) {
+        // Store to preferences so that we can launch the app later on without having to specify
+        // token.
+        [[NSUserDefaults standardUserDefaults] setObject:accessToken forKey:@"access_token"];
+    } else {
+        // Try to retrieve from preferences, maybe we've stored them there previously and can reuse
+        // the token.
+        accessToken = [[NSUserDefaults standardUserDefaults] objectForKey:@"access_token"];
+    }
+    if ( ! accessToken) NSLog(@"No access token set. Mapbox vector tiles won't work.");
+
+    // Signal To SDK That Opt Out Is In App UI
+//    [MGLAccountManager setMapboxMetricsEnabledSettingShownInApp:YES];
+
+    // Start Mapbox GL SDK
+    [MGLAccountManager setAccessToken:accessToken];
+
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
     self.window.rootViewController = [[UINavigationController alloc] initWithRootViewController:[MBXViewController new]];
     [self.window makeKeyAndVisible];
@@ -13,26 +32,4 @@
     return YES;
 }
 
-/**
-- (void)applicationWillEnterForeground:(UIApplication *)application
-{
-    // Example of how to resume Metrics Collection
-    
-    // Reasons for needing to resume:
-    // 1. In UIBackground and app starts listening for Location Updates where it previously had not been listening.
-    // 2. App is entering foreground where it had called pauseMetricsCollection.
-    [MGLMapboxEvents resumeMetricsCollection];
-}
-
-- (void)applicationDidEnterBackground:(UIApplication *)application
-{
-    // Example of how to pause Metrics Collection
-    
-    // Reason for needing to pause:
-    // 1. Either entering or already in UIBackground and app stops listening for Location Updates
-    // via any CLLocationManager instance it may have.
-    [MGLMapboxEvents pauseMetricsCollection];
-}
-*/
-
 @end
diff --git a/ios/app/MBXViewController.mm b/ios/app/MBXViewController.mm
index 13235beb0..9ccda7ac6 100644
--- a/ios/app/MBXViewController.mm
+++ b/ios/app/MBXViewController.mm
@@ -52,22 +52,8 @@ mbgl::Settings_NSUserDefaults *settings = nullptr;
 {
     [super viewDidLoad];
 
-    NSString *accessToken = [[NSProcessInfo processInfo] environment][@"MAPBOX_ACCESS_TOKEN"];
-    if (accessToken) {
-        // Store to preferences so that we can launch the app later on without having to specify
-        // token.
-        [[NSUserDefaults standardUserDefaults] setObject:accessToken forKey:@"access_token"];
-    } else {
-        // Try to retrieve from preferences, maybe we've stored them there previously and can reuse
-        // the token.
-        accessToken = [[NSUserDefaults standardUserDefaults] objectForKey:@"access_token"];
-    }
-
-    if ( ! accessToken) NSLog(@"No access token set. Mapbox vector tiles won't work.");
-
-    self.mapView = [[MGLMapView alloc] initWithFrame:self.view.bounds accessToken:accessToken];
+    self.mapView = [[MGLMapView alloc] initWithFrame:self.view.bounds];
     self.mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-    self.mapView.viewControllerForLayoutGuides = self;
     self.mapView.showsUserLocation = YES;
     self.mapView.delegate = self;
     [self.view addSubview:self.mapView];
@@ -97,10 +83,7 @@ mbgl::Settings_NSUserDefaults *settings = nullptr;
     [self restoreState:nil];
 }
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-parameter"
-
-- (void)saveState:(NSNotification *)notification
+- (void)saveState:(__unused NSNotification *)notification
 {
     if (self.mapView && settings)
     {
@@ -115,7 +98,7 @@ mbgl::Settings_NSUserDefaults *settings = nullptr;
     }
 }
 
-- (void)restoreState:(NSNotification *)notification
+- (void)restoreState:(__unused NSNotification *)notification
 {
     if (self.mapView && settings) {
         settings->load();
@@ -127,8 +110,6 @@ mbgl::Settings_NSUserDefaults *settings = nullptr;
     }
 }
 
-#pragma clang diagnostic pop
-
 - (NSUInteger)supportedInterfaceOrientations
 {
     return UIInterfaceOrientationMaskAll;
@@ -291,17 +272,14 @@ mbgl::Settings_NSUserDefaults *settings = nullptr;
     }
 }
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-parameter"
-
 #pragma mark - MGLMapViewDelegate
 
-- (BOOL)mapView:(MGLMapView *)mapView annotationCanShowCallout:(id <MGLAnnotation>)annotation
+- (BOOL)mapView:(__unused MGLMapView *)mapView annotationCanShowCallout:(__unused id <MGLAnnotation>)annotation
 {
     return YES;
 }
 
-- (void)mapView:(MGLMapView *)mapView didChangeUserTrackingMode:(MGLUserTrackingMode)mode animated:(BOOL)animated
+- (void)mapView:(__unused MGLMapView *)mapView didChangeUserTrackingMode:(MGLUserTrackingMode)mode animated:(__unused BOOL)animated
 {
     UIImage *newButtonImage;
     
@@ -324,6 +302,4 @@ mbgl::Settings_NSUserDefaults *settings = nullptr;
     }];
 }
 
-#pragma clang diagnostic pop
-
 @end
diff --git a/ios/app/Settings.bundle/Root.plist b/ios/app/Settings.bundle/Root.plist
index f3a995024..076f402e1 100644
--- a/ios/app/Settings.bundle/Root.plist
+++ b/ios/app/Settings.bundle/Root.plist
@@ -4,7 +4,7 @@
 <dict>
 	<key>PreferenceSpecifiers</key>
 	<array>
-        <dict>
+		<dict>
 			<key>Title</key>
 			<string>Privacy Settings</string>
 			<key>Type</key>
@@ -16,7 +16,7 @@
 			<key>DefaultValue</key>
 			<true/>
 			<key>Key</key>
-			<string>mapbox_metrics_enabled_preference</string>
+			<string>MGLMapboxMetricsEnabled</string>
 			<key>Title</key>
 			<string>Mapbox Metrics</string>
 			<key>Type</key>
diff --git a/ios/app/app-info.plist b/ios/app/app-info.plist
index cd74f5839..85afe3e7a 100644
--- a/ios/app/app-info.plist
+++ b/ios/app/app-info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>MBGL</string>
 	<key>CFBundleVersion</key>
-	<string>0.0.2</string>
+	<string>0.0.3</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
@@ -47,5 +47,7 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>MGLMetricsTestServerURL</key>
+	<string>https://cloudfront-staging.tilestream.net</string>
 </dict>
 </plist>
diff --git a/ios/app/mapboxgl-app.gyp b/ios/app/mapboxgl-app.gypi
similarity index 80%
rename from ios/app/mapboxgl-app.gyp
rename to ios/app/mapboxgl-app.gypi
index 0e093a1d8..73b66dff1 100644
--- a/ios/app/mapboxgl-app.gyp
+++ b/ios/app/mapboxgl-app.gypi
@@ -9,18 +9,18 @@
       'product_extension': 'app',
       'mac_bundle': 1,
       'mac_bundle_resources': [
-        '<!@(find ./img -type f)',
+        '<!@(find ../ios/app/img -type f)',
         './features.geojson',
         './Settings.bundle/'
       ],
 
       'dependencies': [
-        '../../mbgl.gyp:bundle_styles',
-        '../../mbgl.gyp:core',
-        '../../mbgl.gyp:platform-<(platform_lib)',
-        '../../mbgl.gyp:http-<(http_lib)',
-        '../../mbgl.gyp:asset-<(asset_lib)',
-        '../../mbgl.gyp:cache-<(cache_lib)',
+        '../mbgl.gyp:bundle_styles',
+        '../mbgl.gyp:core',
+        '../mbgl.gyp:platform-<(platform_lib)',
+        '../mbgl.gyp:http-<(http_lib)',
+        '../mbgl.gyp:asset-<(asset_lib)',
+        '../mbgl.gyp:cache-<(cache_lib)',
       ],
 
       'sources': [
@@ -38,7 +38,7 @@
         'SDKROOT': 'iphoneos',
         'SUPPORTED_PLATFORMS': 'iphonesimulator iphoneos',
         'IPHONEOS_DEPLOYMENT_TARGET': '7.0',
-        'INFOPLIST_FILE': 'app-info.plist',
+        'INFOPLIST_FILE': '../ios/app/app-info.plist',
         'TARGETED_DEVICE_FAMILY': '1,2',
         'COMBINE_HIDPI_IMAGES': 'NO', # don't merge @2x.png images into .tiff files
         'CLANG_ENABLE_OBJC_ARC': 'YES',
diff --git a/ios/benchmark/MBXBenchAppDelegate.h b/ios/benchmark/MBXBenchAppDelegate.h
new file mode 100644
index 000000000..b8f6c2e64
--- /dev/null
+++ b/ios/benchmark/MBXBenchAppDelegate.h
@@ -0,0 +1,7 @@
+#import <UIKit/UIKit.h>
+
+@interface MBXBenchAppDelegate : UIResponder <UIApplicationDelegate>
+
+@property (strong, nonatomic) UIWindow *window;
+
+@end
\ No newline at end of file
diff --git a/ios/benchmark/MBXBenchAppDelegate.m b/ios/benchmark/MBXBenchAppDelegate.m
new file mode 100644
index 000000000..e8fbd88d2
--- /dev/null
+++ b/ios/benchmark/MBXBenchAppDelegate.m
@@ -0,0 +1,15 @@
+#import "MBXBenchAppDelegate.h"
+#import "MBXBenchViewController.h"
+
+@implementation MBXBenchAppDelegate
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+    self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+    self.window.rootViewController = [MBXBenchViewController new];
+    [self.window makeKeyAndVisible];
+
+    return YES;
+}
+
+@end
diff --git a/ios/benchmark/MBXBenchViewController.h b/ios/benchmark/MBXBenchViewController.h
new file mode 100644
index 000000000..c4439be5e
--- /dev/null
+++ b/ios/benchmark/MBXBenchViewController.h
@@ -0,0 +1,5 @@
+#import <UIKit/UIKit.h>
+
+@interface MBXBenchViewController : UIViewController
+
+@end
diff --git a/ios/benchmark/MBXBenchViewController.mm b/ios/benchmark/MBXBenchViewController.mm
new file mode 100644
index 000000000..dfd3b254a
--- /dev/null
+++ b/ios/benchmark/MBXBenchViewController.mm
@@ -0,0 +1,148 @@
+#import "MBXBenchViewController.h"
+
+#import <mbgl/ios/MGLMapView.h>
+
+#include "locations.hpp"
+
+#include <chrono>
+
+@interface MGLMapView (MBXBenchmarkAdditions)
+
+#pragma mark - Debugging
+
+/** Triggers another render pass even when it is not necessary. */
+- (void)invalidate;
+
+/** Returns whether the map view is currently loading or processing any assets required to render the map */
+- (BOOL)isFullyLoaded;
+
+@end
+
+@interface MBXBenchViewController () <MGLMapViewDelegate>
+
+@property (nonatomic) MGLMapView *mapView;
+
+@end
+
+@implementation MBXBenchViewController
+
+#pragma mark - Setup
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+
+    NSURL* url = [[NSURL alloc] initWithString:@"asset://styles/mapbox-streets-v7.json"];
+    self.mapView = [[MGLMapView alloc] initWithFrame:self.view.bounds accessToken:nil styleURL:url];
+    self.mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+    self.mapView.delegate = self;
+    self.mapView.zoomEnabled = NO;
+    self.mapView.scrollEnabled = NO;
+    self.mapView.rotateEnabled = NO;
+    self.mapView.userInteractionEnabled = YES;
+    [self.mapView setDebugActive:NO];
+
+    [self startBenchmarkIteration];
+
+    [self.view addSubview:self.mapView];
+
+}
+
+using Clock = std::chrono::steady_clock;
+using TimePoint = Clock::time_point;
+template <typename Duration>
+inline int64_t Microseconds(Duration d) {
+    return std::chrono::duration_cast<std::chrono::microseconds>(d).count();
+}
+
+size_t idx = 0;
+enum class State { None, WaitingForAssets, WarmingUp, Benchmarking } state = State::None;
+int frames = 0;
+TimePoint started;
+std::vector<std::pair<std::string, double>> result;
+
+static const int warmupDuration = 20; // frames
+static const int benchmarkDuration = 200; // frames
+
+- (void)startBenchmarkIteration
+{
+    if (mbgl::bench::locations.size() > idx) {
+        const auto& location = mbgl::bench::locations[idx];
+        [self.mapView setCenterCoordinate:CLLocationCoordinate2DMake(location.latitude, location.longitude) zoomLevel:location.zoom animated:NO];
+        self.mapView.direction = location.bearing;
+        state = State::WaitingForAssets;
+        NSLog(@"Benchmarking \"%s\"", location.name.c_str());
+        NSLog(@"- Loading assets...");
+    } else {
+        // Do nothing. The benchmark is completed.
+        NSLog(@"Benchmark completed.");
+        NSLog(@"Result:");
+        size_t colWidth = 0;
+        for (const auto& row : result) {
+            colWidth = std::max(row.first.size(), colWidth);
+        }
+        for (const auto& row : result) {
+            NSLog(@"| %-*s | %4.1f fps |", int(colWidth), row.first.c_str(), row.second);
+        }
+        exit(0);
+    }
+}
+
+- (void)mapViewDidFinishRenderingMap:(MGLMapView *)mapView fullyRendered:(__unused BOOL)fullyRendered
+{
+    if (state == State::Benchmarking)
+    {
+        frames++;
+        if (frames >= benchmarkDuration)
+        {
+            state = State::None;
+
+            // Report FPS
+            const auto duration = Microseconds(Clock::now() - started);
+            const auto fps = double(frames * 1e6) / duration;
+            result.emplace_back(mbgl::bench::locations[idx].name, fps);
+            NSLog(@"- FPS: %.1f", fps);
+
+            // Start benchmarking the next location.
+            idx++;
+            [self startBenchmarkIteration];
+        } else {
+            [mapView invalidate];
+        }
+        return;
+    }
+
+    else if (state == State::WarmingUp)
+    {
+        frames++;
+        if (frames >= warmupDuration)
+        {
+            frames = 0;
+            state = State::Benchmarking;
+            started = Clock::now();
+            NSLog(@"- Benchmarking for %d frames...", benchmarkDuration);
+        }
+        [mapView invalidate];
+        return;
+    }
+
+    else if (state == State::WaitingForAssets)
+    {
+        if ([mapView isFullyLoaded])
+        {
+            // Start the benchmarking timer.
+            state = State::WarmingUp;
+            [self.mapView emptyMemoryCache];
+            NSLog(@"- Warming up for %d frames...", warmupDuration);
+            [mapView invalidate];
+        }
+        return;
+    }
+}
+
+- (NSUInteger)supportedInterfaceOrientations
+{
+    return UIInterfaceOrientationMaskLandscape;
+}
+
+@end
diff --git a/ios/benchmark/app-info.plist b/ios/benchmark/app-info.plist
new file mode 100644
index 000000000..fe29fce2c
--- /dev/null
+++ b/ios/benchmark/app-info.plist
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.mapbox.GL.benchmark</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>0.0.2</string>
+	<key>CFBundleSignature</key>
+	<string>MBGL</string>
+	<key>CFBundleVersion</key>
+	<string>0.0.3</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>(c) 2015 Mapbox</string>
+	<key>UIApplicationExitsOnSuspend</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>Default</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>
diff --git a/ios/benchmark/assets/glyphs/download.sh b/ios/benchmark/assets/glyphs/download.sh
new file mode 100755
index 000000000..0ac151382
--- /dev/null
+++ b/ios/benchmark/assets/glyphs/download.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+set -u
+
+LIST=(
+    "DIN%20Offc%20Pro%20Regular%2c%20Arial%20Unicode%20MS%20Regular/0-255.pbf"
+    "DIN%20Offc%20Pro%20Medium%2c%20Arial%20Unicode%20MS%20Bold/0-255.pbf"
+    "DIN%20Offc%20Pro%20Medium%2c%20Arial%20Unicode%20MS%20Regular/0-255.pbf"
+    "DIN%20Offc%20Pro%20Medium%2c%20Arial%20Unicode%20MS%20Regular/8192-8447.pbf"
+    "DIN%20Offc%20Pro%20Bold%2c%20Arial%20Unicode%20MS%20Regular/0-255.pbf"
+    "DIN%20Offc%20Pro%20Regular%2c%20Arial%20Unicode%20MS%20Regular/256-511.pbf"
+    "DIN%20Offc%20Pro%20Regular%2c%20Arial%20Unicode%20MS%20Regular/8192-8447.pbf"
+    "DIN%20Offc%20Pro%20Italic%2c%20Arial%20Unicode%20MS%20Regular/0-255.pbf"
+    "DIN%20Offc%20Pro%20Medium%2c%20Arial%20Unicode%20MS%20Regular/256-511.pbf"
+)
+
+# from https://gist.github.com/cdown/1163649
+urldecode() {
+    local url_encoded="${1//+/ }"
+    printf '%b' "${url_encoded//%/\x}"
+}
+
+for i in ${LIST[@]} ; do
+    OUTPUT=`urldecode "$i"`
+    if [ ! -f "${OUTPUT}" ] ; then
+        mkdir -p "`dirname "${OUTPUT}"`"
+        echo "Downloading glyph '${OUTPUT}'"
+        curl -# "https://api.tiles.mapbox.com/v4/fontstack/${i}?access_token=${MAPBOX_ACCESS_TOKEN}" | gunzip > "${OUTPUT}"
+    fi
+done
diff --git a/ios/benchmark/assets/sprites/mapbox-streets.json b/ios/benchmark/assets/sprites/mapbox-streets.json
new file mode 100644
index 000000000..488bf335d
--- /dev/null
+++ b/ios/benchmark/assets/sprites/mapbox-streets.json
@@ -0,0 +1,2034 @@
+{
+  "secondary_marker": {
+    "x": 0,
+    "y": 0,
+    "width": 20,
+    "height": 50,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "default_marker": {
+    "x": 22,
+    "y": 0,
+    "width": 20,
+    "height": 50,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-highway-alternate-1-large": {
+    "x": 44,
+    "y": 0,
+    "width": 21,
+    "height": 37,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-highway-business-1-large": {
+    "x": 67,
+    "y": 0,
+    "width": 27,
+    "height": 37,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-highway-business-2-large": {
+    "x": 0,
+    "y": 52,
+    "width": 27,
+    "height": 37,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-highway-alternate-2-large": {
+    "x": 29,
+    "y": 52,
+    "width": 27,
+    "height": 37,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-highway-truck-1-large": {
+    "x": 58,
+    "y": 52,
+    "width": 23,
+    "height": 35,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-highway-truck-2-large": {
+    "x": 96,
+    "y": 0,
+    "width": 27,
+    "height": 35,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "marsh-32": {
+    "x": 0,
+    "y": 91,
+    "width": 32,
+    "height": 32,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-highway-alternate-1-small": {
+    "x": 96,
+    "y": 37,
+    "width": 17,
+    "height": 31,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-highway-business-1-small": {
+    "x": 34,
+    "y": 91,
+    "width": 17,
+    "height": 31,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-highway-alternate-2-small": {
+    "x": 53,
+    "y": 91,
+    "width": 21,
+    "height": 31,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-highway-truck-2-small": {
+    "x": 76,
+    "y": 91,
+    "width": 21,
+    "height": 31,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-highway-business-2-small": {
+    "x": 99,
+    "y": 91,
+    "width": 21,
+    "height": 31,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-highway-truck-1-small": {
+    "x": 125,
+    "y": 0,
+    "width": 17,
+    "height": 31,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-interstate-duplex-4-large": {
+    "x": 144,
+    "y": 0,
+    "width": 40,
+    "height": 29,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-interstate-duplex-3-large": {
+    "x": 144,
+    "y": 31,
+    "width": 35,
+    "height": 29,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-interstate-2-large": {
+    "x": 144,
+    "y": 62,
+    "width": 29,
+    "height": 29,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-interstate-duplex-5-large": {
+    "x": 0,
+    "y": 125,
+    "width": 43,
+    "height": 29,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-interstate-3-large": {
+    "x": 144,
+    "y": 93,
+    "width": 35,
+    "height": 29,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-interstate-1-large": {
+    "x": 45,
+    "y": 125,
+    "width": 25,
+    "height": 29,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-interstate-business-3-large": {
+    "x": 72,
+    "y": 125,
+    "width": 35,
+    "height": 28,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-interstate-business-2-large": {
+    "x": 109,
+    "y": 125,
+    "width": 29,
+    "height": 28,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-interstate-business-1-large": {
+    "x": 140,
+    "y": 125,
+    "width": 25,
+    "height": 28,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "mx-federal-2-large": {
+    "x": 0,
+    "y": 156,
+    "width": 25,
+    "height": 26,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "mx-federal-4-large": {
+    "x": 27,
+    "y": 156,
+    "width": 37,
+    "height": 26,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "mx-federal-1-large": {
+    "x": 66,
+    "y": 156,
+    "width": 20,
+    "height": 26,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "mx-federal-3-large": {
+    "x": 88,
+    "y": 156,
+    "width": 30,
+    "height": 26,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "mx-state-3-large": {
+    "x": 120,
+    "y": 156,
+    "width": 31,
+    "height": 25,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "mx-state-4-large": {
+    "x": 186,
+    "y": 0,
+    "width": 36,
+    "height": 25,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-interstate-3-small": {
+    "x": 186,
+    "y": 27,
+    "width": 30,
+    "height": 25,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-interstate-2-small": {
+    "x": 186,
+    "y": 54,
+    "width": 25,
+    "height": 25,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-interstate-1-small": {
+    "x": 186,
+    "y": 81,
+    "width": 21,
+    "height": 25,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-interstate-duplex-5-small": {
+    "x": 186,
+    "y": 108,
+    "width": 36,
+    "height": 25,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-interstate-duplex-4-small": {
+    "x": 186,
+    "y": 135,
+    "width": 34,
+    "height": 25,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-interstate-duplex-3-small": {
+    "x": 153,
+    "y": 156,
+    "width": 30,
+    "height": 25,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-interstate-business-2-small": {
+    "x": 0,
+    "y": 184,
+    "width": 25,
+    "height": 24,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-interstate-business-3-small": {
+    "x": 27,
+    "y": 184,
+    "width": 30,
+    "height": 24,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-interstate-business-1-small": {
+    "x": 59,
+    "y": 184,
+    "width": 21,
+    "height": 24,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "mx-state-1-large": {
+    "x": 82,
+    "y": 184,
+    "width": 20,
+    "height": 24,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "mx-state-2-large": {
+    "x": 104,
+    "y": 184,
+    "width": 25,
+    "height": 24,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "post-15": {
+    "x": 131,
+    "y": 184,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "prison-15": {
+    "x": 156,
+    "y": 184,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "religious-christian-15": {
+    "x": 181,
+    "y": 184,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "religious-jewish-15": {
+    "x": 224,
+    "y": 0,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "religious-muslim-15": {
+    "x": 224,
+    "y": 25,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "rocket-15": {
+    "x": 224,
+    "y": 50,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "shop-15": {
+    "x": 224,
+    "y": 75,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "star-15": {
+    "x": 224,
+    "y": 100,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "suitcase-15": {
+    "x": 224,
+    "y": 125,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "swimming-15": {
+    "x": 224,
+    "y": 150,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "theatre-15": {
+    "x": 224,
+    "y": 175,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "town-hall-15": {
+    "x": 0,
+    "y": 210,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "triangle-15": {
+    "x": 25,
+    "y": 210,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "triangle-stroked-15": {
+    "x": 50,
+    "y": 210,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "dentist-15": {
+    "x": 75,
+    "y": 210,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "hospital-15": {
+    "x": 100,
+    "y": 210,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "pharmacy-15": {
+    "x": 125,
+    "y": 210,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "america-football-15": {
+    "x": 150,
+    "y": 210,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "baseball-15": {
+    "x": 175,
+    "y": 210,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "basketball-15": {
+    "x": 200,
+    "y": 210,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "campsite-15": {
+    "x": 249,
+    "y": 0,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "cemetery-15": {
+    "x": 249,
+    "y": 25,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "dog-park-15": {
+    "x": 249,
+    "y": 50,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "beer-15": {
+    "x": 249,
+    "y": 75,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "park-15": {
+    "x": 249,
+    "y": 100,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "bar-15": {
+    "x": 249,
+    "y": 125,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "playground-15": {
+    "x": 249,
+    "y": 150,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "zoo-15": {
+    "x": 249,
+    "y": 175,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "college-15": {
+    "x": 249,
+    "y": 200,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "ferry-15": {
+    "x": 0,
+    "y": 235,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "school-15": {
+    "x": 25,
+    "y": 235,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "rail-metro-15": {
+    "x": 50,
+    "y": 235,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "cafe-15": {
+    "x": 75,
+    "y": 235,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "bus-15": {
+    "x": 100,
+    "y": 235,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "airport-15": {
+    "x": 125,
+    "y": 235,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "airfield-15": {
+    "x": 150,
+    "y": 235,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "fast-food-15": {
+    "x": 175,
+    "y": 235,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "rail-light-15": {
+    "x": 200,
+    "y": 235,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "rail-15": {
+    "x": 225,
+    "y": 235,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "heliport-15": {
+    "x": 274,
+    "y": 0,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "restaurant-15": {
+    "x": 274,
+    "y": 25,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "alcohol-shop-15": {
+    "x": 274,
+    "y": 50,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "art-gallery-15": {
+    "x": 274,
+    "y": 75,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "bakery-15": {
+    "x": 274,
+    "y": 100,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "bank-15": {
+    "x": 274,
+    "y": 125,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "bicycle-15": {
+    "x": 274,
+    "y": 150,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "car-15": {
+    "x": 274,
+    "y": 175,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "cinema-15": {
+    "x": 274,
+    "y": 200,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "circle-15": {
+    "x": 274,
+    "y": 225,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "circle-stroked-15": {
+    "x": 0,
+    "y": 260,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "clothing-store-15": {
+    "x": 25,
+    "y": 260,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "embassy-15": {
+    "x": 50,
+    "y": 260,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "fire-station-15": {
+    "x": 75,
+    "y": 260,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "fuel-15": {
+    "x": 100,
+    "y": 260,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "garden-15": {
+    "x": 125,
+    "y": 260,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "grocery-15": {
+    "x": 150,
+    "y": 260,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "hairdresser-15": {
+    "x": 175,
+    "y": 260,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "harbor-15": {
+    "x": 200,
+    "y": 260,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "ice-cream-15": {
+    "x": 225,
+    "y": 260,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "laundry-15": {
+    "x": 250,
+    "y": 260,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "library-15": {
+    "x": 299,
+    "y": 0,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "lodging-15": {
+    "x": 299,
+    "y": 25,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "marker-15": {
+    "x": 299,
+    "y": 50,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "monument-15": {
+    "x": 299,
+    "y": 75,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "museum-15": {
+    "x": 299,
+    "y": 100,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "music-15": {
+    "x": 299,
+    "y": 125,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "place-of-worship-15": {
+    "x": 299,
+    "y": 150,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "police-15": {
+    "x": 299,
+    "y": 175,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "golf-15": {
+    "x": 299,
+    "y": 200,
+    "width": 23,
+    "height": 23,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "mx-federal-4-small": {
+    "x": 0,
+    "y": 285,
+    "width": 31,
+    "height": 22,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "mx-federal-1-small": {
+    "x": 299,
+    "y": 225,
+    "width": 17,
+    "height": 22,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-highway-duplex-3-large": {
+    "x": 33,
+    "y": 285,
+    "width": 32,
+    "height": 22,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "mx-federal-2-small": {
+    "x": 299,
+    "y": 249,
+    "width": 21,
+    "height": 22,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-highway-duplex-4-large": {
+    "x": 67,
+    "y": 285,
+    "width": 34,
+    "height": 22,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "mx-federal-3-small": {
+    "x": 103,
+    "y": 285,
+    "width": 25,
+    "height": 22,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-highway-duplex-5-large": {
+    "x": 130,
+    "y": 285,
+    "width": 37,
+    "height": 22,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "washington-metro-11": {
+    "x": 225,
+    "y": 210,
+    "width": 21,
+    "height": 21,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-highway-3-large": {
+    "x": 169,
+    "y": 285,
+    "width": 30,
+    "height": 21,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-highway-2-large": {
+    "x": 201,
+    "y": 285,
+    "width": 27,
+    "height": 21,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "light-11": {
+    "x": 250,
+    "y": 235,
+    "width": 21,
+    "height": 21,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "subway-11": {
+    "x": 275,
+    "y": 260,
+    "width": 21,
+    "height": 21,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-highway-1-large": {
+    "x": 230,
+    "y": 285,
+    "width": 20,
+    "height": 21,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "u-bahn-11": {
+    "x": 252,
+    "y": 285,
+    "width": 21,
+    "height": 21,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "mx-state-1-small": {
+    "x": 186,
+    "y": 162,
+    "width": 17,
+    "height": 20,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "mx-state-4-small": {
+    "x": 275,
+    "y": 285,
+    "width": 29,
+    "height": 20,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "mx-state-3-small": {
+    "x": 324,
+    "y": 0,
+    "width": 25,
+    "height": 20,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "circle.sdf": {
+    "x": 324,
+    "y": 22,
+    "width": 19,
+    "height": 20,
+    "pixelRatio": 1,
+    "sdf": true
+  },
+  "mx-state-2-small": {
+    "x": 324,
+    "y": 44,
+    "width": 21,
+    "height": 20,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "zoo-11": {
+    "x": 324,
+    "y": 66,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "beer-11": {
+    "x": 324,
+    "y": 87,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "dlr-11": {
+    "x": 324,
+    "y": 108,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "dlr.london-overground.london-underground.national-rail-11": {
+    "x": 0,
+    "y": 309,
+    "width": 75,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "dlr.london-underground-11": {
+    "x": 77,
+    "y": 309,
+    "width": 39,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "dlr.london-underground.national-rail-11": {
+    "x": 118,
+    "y": 309,
+    "width": 57,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "dlr.national-rail-11": {
+    "x": 177,
+    "y": 309,
+    "width": 39,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "heliport-11": {
+    "x": 324,
+    "y": 129,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "museum-11": {
+    "x": 324,
+    "y": 150,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "london-overground-11": {
+    "x": 324,
+    "y": 171,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "london-overground.london-underground-11": {
+    "x": 218,
+    "y": 309,
+    "width": 39,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "london-overground.london-underground.national-rail-11": {
+    "x": 259,
+    "y": 309,
+    "width": 57,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "london-overground.national-rail-11": {
+    "x": 0,
+    "y": 330,
+    "width": 39,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "london-underground-11": {
+    "x": 324,
+    "y": 192,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "london-underground.national-rail-11": {
+    "x": 41,
+    "y": 330,
+    "width": 39,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "circle-11": {
+    "x": 324,
+    "y": 213,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "metro.rer-11": {
+    "x": 82,
+    "y": 330,
+    "width": 39,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "moscow-metro-11": {
+    "x": 324,
+    "y": 234,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "national-rail-11": {
+    "x": 324,
+    "y": 255,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "rail-11": {
+    "x": 324,
+    "y": 276,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "rer-11": {
+    "x": 96,
+    "y": 70,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "rer.transilien-11": {
+    "x": 123,
+    "y": 330,
+    "width": 39,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "s-bahn-11": {
+    "x": 318,
+    "y": 309,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "music-11": {
+    "x": 164,
+    "y": 330,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "transilien-11": {
+    "x": 185,
+    "y": 330,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "school-11": {
+    "x": 206,
+    "y": 330,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "place-of-worship-11": {
+    "x": 227,
+    "y": 330,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "weiner-linien-11": {
+    "x": 248,
+    "y": 330,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "ferry-11": {
+    "x": 269,
+    "y": 330,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "circle-stroked-11": {
+    "x": 290,
+    "y": 330,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "bus-11": {
+    "x": 311,
+    "y": 330,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "police-11": {
+    "x": 351,
+    "y": 0,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "airport-11": {
+    "x": 351,
+    "y": 21,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "fast-food-11": {
+    "x": 351,
+    "y": 42,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "airfield-11": {
+    "x": 351,
+    "y": 63,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "post-11": {
+    "x": 351,
+    "y": 84,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "clothing-store-11": {
+    "x": 351,
+    "y": 105,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "prison-11": {
+    "x": 351,
+    "y": 126,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "alcohol-shop-11": {
+    "x": 351,
+    "y": 147,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "religious-christian-11": {
+    "x": 351,
+    "y": 168,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "embassy-11": {
+    "x": 351,
+    "y": 189,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "religious-jewish-11": {
+    "x": 351,
+    "y": 210,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "bar-11": {
+    "x": 351,
+    "y": 231,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "religious-muslim-11": {
+    "x": 351,
+    "y": 252,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "fire-station-11": {
+    "x": 351,
+    "y": 273,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "rocket-11": {
+    "x": 351,
+    "y": 294,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "art-gallery-11": {
+    "x": 351,
+    "y": 315,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "shop-11": {
+    "x": 0,
+    "y": 351,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "fuel-11": {
+    "x": 21,
+    "y": 351,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "star-11": {
+    "x": 42,
+    "y": 351,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "restaurant-11": {
+    "x": 63,
+    "y": 351,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "suitcase-11": {
+    "x": 84,
+    "y": 351,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "garden-11": {
+    "x": 105,
+    "y": 351,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "swimming-11": {
+    "x": 126,
+    "y": 351,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "bakery-11": {
+    "x": 147,
+    "y": 351,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "theatre-11": {
+    "x": 168,
+    "y": 351,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "grocery-11": {
+    "x": 189,
+    "y": 351,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "town-hall-11": {
+    "x": 210,
+    "y": 351,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "rail-metro-11": {
+    "x": 231,
+    "y": 351,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "triangle-11": {
+    "x": 252,
+    "y": 351,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "hairdresser-11": {
+    "x": 273,
+    "y": 351,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "triangle-stroked-11": {
+    "x": 294,
+    "y": 351,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "bank-11": {
+    "x": 315,
+    "y": 351,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "dentist-11": {
+    "x": 336,
+    "y": 351,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "harbor-11": {
+    "x": 372,
+    "y": 0,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "hospital-11": {
+    "x": 372,
+    "y": 21,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "cafe-11": {
+    "x": 372,
+    "y": 42,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "pharmacy-11": {
+    "x": 372,
+    "y": 63,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "ice-cream-11": {
+    "x": 372,
+    "y": 84,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "america-football-11": {
+    "x": 372,
+    "y": 105,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "bicycle-11": {
+    "x": 372,
+    "y": 126,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "baseball-11": {
+    "x": 372,
+    "y": 147,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "laundry-11": {
+    "x": 372,
+    "y": 168,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "basketball-11": {
+    "x": 372,
+    "y": 189,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "college-11": {
+    "x": 372,
+    "y": 210,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "campsite-11": {
+    "x": 372,
+    "y": 231,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "library-11": {
+    "x": 372,
+    "y": 252,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "cemetery-11": {
+    "x": 372,
+    "y": 273,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "car-11": {
+    "x": 372,
+    "y": 294,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "dog-park-11": {
+    "x": 372,
+    "y": 315,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "lodging-11": {
+    "x": 372,
+    "y": 336,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "golf-11": {
+    "x": 0,
+    "y": 372,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "rail-light-11": {
+    "x": 21,
+    "y": 372,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "park-11": {
+    "x": 42,
+    "y": 372,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "marker-11": {
+    "x": 63,
+    "y": 372,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "cinema-11": {
+    "x": 84,
+    "y": 372,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "monument-11": {
+    "x": 105,
+    "y": 372,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "playground-11": {
+    "x": 126,
+    "y": 372,
+    "width": 19,
+    "height": 19,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-state-5-large": {
+    "x": 147,
+    "y": 372,
+    "width": 48,
+    "height": 18,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "default-1-large": {
+    "x": 197,
+    "y": 372,
+    "width": 18,
+    "height": 18,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-highway-3-small": {
+    "x": 217,
+    "y": 372,
+    "width": 25,
+    "height": 18,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-highway-2-small": {
+    "x": 244,
+    "y": 372,
+    "width": 21,
+    "height": 18,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-highway-1-small": {
+    "x": 205,
+    "y": 162,
+    "width": 17,
+    "height": 18,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "default-2-large": {
+    "x": 267,
+    "y": 372,
+    "width": 25,
+    "height": 18,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "default-6-large": {
+    "x": 294,
+    "y": 372,
+    "width": 50,
+    "height": 18,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "default-3-large": {
+    "x": 346,
+    "y": 372,
+    "width": 32,
+    "height": 18,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "default-5-large": {
+    "x": 393,
+    "y": 0,
+    "width": 45,
+    "height": 18,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "default-4-large": {
+    "x": 393,
+    "y": 20,
+    "width": 39,
+    "height": 18,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-state-1-large": {
+    "x": 393,
+    "y": 40,
+    "width": 22,
+    "height": 18,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-state-6-large": {
+    "x": 0,
+    "y": 393,
+    "width": 54,
+    "height": 18,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-state-2-large": {
+    "x": 393,
+    "y": 60,
+    "width": 28,
+    "height": 18,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-state-4-large": {
+    "x": 393,
+    "y": 80,
+    "width": 42,
+    "height": 18,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-state-3-large": {
+    "x": 393,
+    "y": 100,
+    "width": 35,
+    "height": 18,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-highway-duplex-5-small": {
+    "x": 393,
+    "y": 120,
+    "width": 29,
+    "height": 17,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-highway-duplex-4-small": {
+    "x": 393,
+    "y": 139,
+    "width": 28,
+    "height": 17,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-highway-duplex-3-small": {
+    "x": 393,
+    "y": 158,
+    "width": 27,
+    "height": 17,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "entrance-11": {
+    "x": 417,
+    "y": 40,
+    "width": 17,
+    "height": 17,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "marsh-16": {
+    "x": 422,
+    "y": 158,
+    "width": 16,
+    "height": 16,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-state-1-small": {
+    "x": 393,
+    "y": 177,
+    "width": 17,
+    "height": 15,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-state-6-small": {
+    "x": 393,
+    "y": 194,
+    "width": 45,
+    "height": 15,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "default-4-small": {
+    "x": 393,
+    "y": 211,
+    "width": 33,
+    "height": 15,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "default-3-small": {
+    "x": 393,
+    "y": 228,
+    "width": 27,
+    "height": 15,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "default-5-small": {
+    "x": 393,
+    "y": 245,
+    "width": 38,
+    "height": 15,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "default-2-small": {
+    "x": 412,
+    "y": 177,
+    "width": 21,
+    "height": 15,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-state-2-small": {
+    "x": 393,
+    "y": 262,
+    "width": 23,
+    "height": 15,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "default-1-small": {
+    "x": 423,
+    "y": 60,
+    "width": 15,
+    "height": 15,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-state-4-small": {
+    "x": 393,
+    "y": 279,
+    "width": 35,
+    "height": 15,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "metro-11": {
+    "x": 423,
+    "y": 139,
+    "width": 15,
+    "height": 15,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-state-3-small": {
+    "x": 393,
+    "y": 296,
+    "width": 29,
+    "height": 15,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "us-state-5-small": {
+    "x": 393,
+    "y": 313,
+    "width": 40,
+    "height": 15,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "default-6-small": {
+    "x": 393,
+    "y": 330,
+    "width": 44,
+    "height": 15,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "oneway-spaced-white-large": {
+    "x": 424,
+    "y": 120,
+    "width": 14,
+    "height": 6,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "oneway-spaced-large": {
+    "x": 424,
+    "y": 128,
+    "width": 14,
+    "height": 6,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "oneway-spaced-small": {
+    "x": 422,
+    "y": 228,
+    "width": 11,
+    "height": 5,
+    "pixelRatio": 1,
+    "sdf": false
+  },
+  "oneway-spaced-white-small": {
+    "x": 422,
+    "y": 235,
+    "width": 11,
+    "height": 5,
+    "pixelRatio": 1,
+    "sdf": false
+  }
+}
\ No newline at end of file
diff --git a/ios/benchmark/assets/sprites/mapbox-streets.png b/ios/benchmark/assets/sprites/mapbox-streets.png
new file mode 100644
index 000000000..00925f91a
Binary files /dev/null and b/ios/benchmark/assets/sprites/mapbox-streets.png differ
diff --git a/ios/benchmark/assets/sprites/mapbox-streets@2x.json b/ios/benchmark/assets/sprites/mapbox-streets@2x.json
new file mode 100644
index 000000000..0a193fb4d
--- /dev/null
+++ b/ios/benchmark/assets/sprites/mapbox-streets@2x.json
@@ -0,0 +1,2034 @@
+{
+  "secondary_marker": {
+    "x": 0,
+    "y": 0,
+    "width": 40,
+    "height": 100,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "default_marker": {
+    "x": 42,
+    "y": 0,
+    "width": 40,
+    "height": 100,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-highway-business-1-large": {
+    "x": 84,
+    "y": 0,
+    "width": 54,
+    "height": 74,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-highway-alternate-1-large": {
+    "x": 140,
+    "y": 0,
+    "width": 42,
+    "height": 74,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-highway-alternate-2-large": {
+    "x": 0,
+    "y": 102,
+    "width": 54,
+    "height": 74,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-highway-business-2-large": {
+    "x": 56,
+    "y": 102,
+    "width": 54,
+    "height": 74,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-highway-truck-1-large": {
+    "x": 112,
+    "y": 102,
+    "width": 46,
+    "height": 70,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-highway-truck-2-large": {
+    "x": 184,
+    "y": 0,
+    "width": 54,
+    "height": 70,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "marsh-32": {
+    "x": 240,
+    "y": 0,
+    "width": 64,
+    "height": 64,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-highway-truck-1-small": {
+    "x": 240,
+    "y": 66,
+    "width": 34,
+    "height": 62,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-highway-business-2-small": {
+    "x": 184,
+    "y": 72,
+    "width": 42,
+    "height": 62,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-highway-alternate-2-small": {
+    "x": 0,
+    "y": 178,
+    "width": 42,
+    "height": 62,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-highway-alternate-1-small": {
+    "x": 44,
+    "y": 178,
+    "width": 34,
+    "height": 62,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-highway-truck-2-small": {
+    "x": 80,
+    "y": 178,
+    "width": 42,
+    "height": 62,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-highway-business-1-small": {
+    "x": 124,
+    "y": 178,
+    "width": 34,
+    "height": 62,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-interstate-duplex-3-large": {
+    "x": 160,
+    "y": 178,
+    "width": 68,
+    "height": 56,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-interstate-3-large": {
+    "x": 230,
+    "y": 178,
+    "width": 68,
+    "height": 56,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-interstate-duplex-4-large": {
+    "x": 0,
+    "y": 242,
+    "width": 78,
+    "height": 56,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-interstate-1-large": {
+    "x": 80,
+    "y": 242,
+    "width": 48,
+    "height": 56,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-interstate-duplex-5-large": {
+    "x": 130,
+    "y": 242,
+    "width": 84,
+    "height": 56,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-interstate-2-large": {
+    "x": 216,
+    "y": 242,
+    "width": 56,
+    "height": 56,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-interstate-business-1-large": {
+    "x": 306,
+    "y": 0,
+    "width": 48,
+    "height": 54,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-interstate-business-2-large": {
+    "x": 0,
+    "y": 300,
+    "width": 56,
+    "height": 54,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-interstate-business-3-large": {
+    "x": 58,
+    "y": 300,
+    "width": 68,
+    "height": 54,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "mx-federal-1-large": {
+    "x": 306,
+    "y": 56,
+    "width": 40,
+    "height": 52,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "mx-federal-2-large": {
+    "x": 128,
+    "y": 300,
+    "width": 50,
+    "height": 52,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "mx-federal-3-large": {
+    "x": 180,
+    "y": 300,
+    "width": 60,
+    "height": 52,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "mx-federal-4-large": {
+    "x": 242,
+    "y": 300,
+    "width": 74,
+    "height": 52,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "mx-state-4-large": {
+    "x": 356,
+    "y": 0,
+    "width": 72,
+    "height": 50,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "mx-state-3-large": {
+    "x": 356,
+    "y": 52,
+    "width": 62,
+    "height": 50,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-interstate-duplex-5-small": {
+    "x": 356,
+    "y": 104,
+    "width": 70,
+    "height": 48,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-interstate-2-small": {
+    "x": 356,
+    "y": 154,
+    "width": 48,
+    "height": 48,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-interstate-duplex-3-small": {
+    "x": 356,
+    "y": 204,
+    "width": 58,
+    "height": 48,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-interstate-duplex-4-small": {
+    "x": 356,
+    "y": 254,
+    "width": 66,
+    "height": 48,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-interstate-1-small": {
+    "x": 356,
+    "y": 304,
+    "width": 40,
+    "height": 48,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "mx-state-2-large": {
+    "x": 0,
+    "y": 356,
+    "width": 50,
+    "height": 48,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-interstate-3-small": {
+    "x": 52,
+    "y": 356,
+    "width": 58,
+    "height": 48,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "mx-state-1-large": {
+    "x": 306,
+    "y": 110,
+    "width": 40,
+    "height": 48,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "music-15": {
+    "x": 306,
+    "y": 160,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "place-of-worship-15": {
+    "x": 306,
+    "y": 208,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "police-15": {
+    "x": 240,
+    "y": 130,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "post-15": {
+    "x": 112,
+    "y": 356,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "prison-15": {
+    "x": 160,
+    "y": 356,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "religious-christian-15": {
+    "x": 208,
+    "y": 356,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "religious-jewish-15": {
+    "x": 256,
+    "y": 356,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "religious-muslim-15": {
+    "x": 304,
+    "y": 356,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "rocket-15": {
+    "x": 352,
+    "y": 356,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "shop-15": {
+    "x": 430,
+    "y": 0,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "star-15": {
+    "x": 430,
+    "y": 48,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "suitcase-15": {
+    "x": 430,
+    "y": 96,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "swimming-15": {
+    "x": 430,
+    "y": 144,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "theatre-15": {
+    "x": 430,
+    "y": 192,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "town-hall-15": {
+    "x": 430,
+    "y": 240,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "triangle-15": {
+    "x": 430,
+    "y": 288,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "triangle-stroked-15": {
+    "x": 430,
+    "y": 336,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "dentist-15": {
+    "x": 0,
+    "y": 406,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "hospital-15": {
+    "x": 48,
+    "y": 406,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "pharmacy-15": {
+    "x": 96,
+    "y": 406,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "america-football-15": {
+    "x": 144,
+    "y": 406,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "baseball-15": {
+    "x": 192,
+    "y": 406,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "basketball-15": {
+    "x": 240,
+    "y": 406,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "campsite-15": {
+    "x": 288,
+    "y": 406,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "cemetery-15": {
+    "x": 336,
+    "y": 406,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "dog-park-15": {
+    "x": 384,
+    "y": 406,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "beer-15": {
+    "x": 478,
+    "y": 0,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "park-15": {
+    "x": 478,
+    "y": 48,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "bar-15": {
+    "x": 478,
+    "y": 96,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "playground-15": {
+    "x": 478,
+    "y": 144,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "zoo-15": {
+    "x": 478,
+    "y": 192,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "ferry-15": {
+    "x": 478,
+    "y": 240,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "bus-15": {
+    "x": 478,
+    "y": 288,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "airport-15": {
+    "x": 478,
+    "y": 336,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "college-15": {
+    "x": 478,
+    "y": 384,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "airfield-15": {
+    "x": 0,
+    "y": 454,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "school-15": {
+    "x": 48,
+    "y": 454,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "rail-metro-15": {
+    "x": 96,
+    "y": 454,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "cafe-15": {
+    "x": 144,
+    "y": 454,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "fast-food-15": {
+    "x": 192,
+    "y": 454,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "rail-light-15": {
+    "x": 240,
+    "y": 454,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "rail-15": {
+    "x": 288,
+    "y": 454,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-interstate-business-3-small": {
+    "x": 336,
+    "y": 454,
+    "width": 58,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "heliport-15": {
+    "x": 396,
+    "y": 454,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-interstate-business-2-small": {
+    "x": 444,
+    "y": 454,
+    "width": 48,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "restaurant-15": {
+    "x": 526,
+    "y": 0,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "alcohol-shop-15": {
+    "x": 526,
+    "y": 48,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-interstate-business-1-small": {
+    "x": 526,
+    "y": 96,
+    "width": 40,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "art-gallery-15": {
+    "x": 526,
+    "y": 144,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "bakery-15": {
+    "x": 526,
+    "y": 192,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "bank-15": {
+    "x": 526,
+    "y": 240,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "bicycle-15": {
+    "x": 526,
+    "y": 288,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "car-15": {
+    "x": 526,
+    "y": 336,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "cinema-15": {
+    "x": 526,
+    "y": 384,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "circle-15": {
+    "x": 526,
+    "y": 432,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "circle-stroked-15": {
+    "x": 0,
+    "y": 502,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "clothing-store-15": {
+    "x": 48,
+    "y": 502,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "embassy-15": {
+    "x": 96,
+    "y": 502,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "fire-station-15": {
+    "x": 144,
+    "y": 502,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "fuel-15": {
+    "x": 192,
+    "y": 502,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "garden-15": {
+    "x": 240,
+    "y": 502,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "grocery-15": {
+    "x": 288,
+    "y": 502,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "hairdresser-15": {
+    "x": 336,
+    "y": 502,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "harbor-15": {
+    "x": 384,
+    "y": 502,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "ice-cream-15": {
+    "x": 432,
+    "y": 502,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "laundry-15": {
+    "x": 480,
+    "y": 502,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "library-15": {
+    "x": 574,
+    "y": 0,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "lodging-15": {
+    "x": 574,
+    "y": 48,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "marker-15": {
+    "x": 574,
+    "y": 96,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "monument-15": {
+    "x": 574,
+    "y": 144,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "museum-15": {
+    "x": 574,
+    "y": 192,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "golf-15": {
+    "x": 574,
+    "y": 240,
+    "width": 46,
+    "height": 46,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "mx-federal-4-small": {
+    "x": 0,
+    "y": 550,
+    "width": 62,
+    "height": 44,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "mx-federal-3-small": {
+    "x": 64,
+    "y": 550,
+    "width": 50,
+    "height": 44,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-highway-duplex-5-large": {
+    "x": 116,
+    "y": 550,
+    "width": 74,
+    "height": 44,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "mx-federal-2-small": {
+    "x": 574,
+    "y": 288,
+    "width": 42,
+    "height": 44,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-highway-duplex-4-large": {
+    "x": 192,
+    "y": 550,
+    "width": 68,
+    "height": 44,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "mx-federal-1-small": {
+    "x": 574,
+    "y": 334,
+    "width": 34,
+    "height": 44,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-highway-duplex-3-large": {
+    "x": 262,
+    "y": 550,
+    "width": 64,
+    "height": 44,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-highway-1-large": {
+    "x": 574,
+    "y": 380,
+    "width": 40,
+    "height": 42,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-highway-2-large": {
+    "x": 328,
+    "y": 550,
+    "width": 54,
+    "height": 42,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-highway-3-large": {
+    "x": 384,
+    "y": 550,
+    "width": 60,
+    "height": 42,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "mx-state-3-small": {
+    "x": 184,
+    "y": 136,
+    "width": 50,
+    "height": 40,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "mx-state-1-small": {
+    "x": 574,
+    "y": 424,
+    "width": 34,
+    "height": 40,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "mx-state-2-small": {
+    "x": 574,
+    "y": 466,
+    "width": 42,
+    "height": 40,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "mx-state-4-small": {
+    "x": 446,
+    "y": 550,
+    "width": 58,
+    "height": 40,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "u-bahn-11": {
+    "x": 574,
+    "y": 508,
+    "width": 40,
+    "height": 40,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "subway-11": {
+    "x": 306,
+    "y": 256,
+    "width": 40,
+    "height": 40,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "light-11": {
+    "x": 432,
+    "y": 406,
+    "width": 40,
+    "height": 40,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "circle.sdf": {
+    "x": 528,
+    "y": 502,
+    "width": 38,
+    "height": 40,
+    "pixelRatio": 2,
+    "sdf": true
+  },
+  "washington-metro-11": {
+    "x": 506,
+    "y": 550,
+    "width": 40,
+    "height": 40,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "zoo-11": {
+    "x": 548,
+    "y": 550,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "beer-11": {
+    "x": 622,
+    "y": 0,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "heliport-11": {
+    "x": 622,
+    "y": 40,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "museum-11": {
+    "x": 622,
+    "y": 80,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "ferry-11": {
+    "x": 622,
+    "y": 120,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "circle-11": {
+    "x": 622,
+    "y": 160,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "bus-11": {
+    "x": 622,
+    "y": 200,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "music-11": {
+    "x": 622,
+    "y": 240,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "school-11": {
+    "x": 622,
+    "y": 280,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "airport-11": {
+    "x": 622,
+    "y": 320,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "place-of-worship-11": {
+    "x": 622,
+    "y": 360,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "airfield-11": {
+    "x": 622,
+    "y": 400,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "circle-stroked-11": {
+    "x": 622,
+    "y": 440,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "police-11": {
+    "x": 622,
+    "y": 480,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "fast-food-11": {
+    "x": 622,
+    "y": 520,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "post-11": {
+    "x": 0,
+    "y": 596,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "clothing-store-11": {
+    "x": 40,
+    "y": 596,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "prison-11": {
+    "x": 80,
+    "y": 596,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "alcohol-shop-11": {
+    "x": 120,
+    "y": 596,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "rail-11": {
+    "x": 160,
+    "y": 596,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "religious-christian-11": {
+    "x": 200,
+    "y": 596,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "embassy-11": {
+    "x": 240,
+    "y": 596,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "religious-jewish-11": {
+    "x": 280,
+    "y": 596,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "bar-11": {
+    "x": 320,
+    "y": 596,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "religious-muslim-11": {
+    "x": 360,
+    "y": 596,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "fire-station-11": {
+    "x": 400,
+    "y": 596,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "rocket-11": {
+    "x": 440,
+    "y": 596,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "art-gallery-11": {
+    "x": 480,
+    "y": 596,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "shop-11": {
+    "x": 520,
+    "y": 596,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "fuel-11": {
+    "x": 560,
+    "y": 596,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "star-11": {
+    "x": 600,
+    "y": 596,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "restaurant-11": {
+    "x": 662,
+    "y": 0,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "suitcase-11": {
+    "x": 662,
+    "y": 40,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "garden-11": {
+    "x": 662,
+    "y": 80,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "swimming-11": {
+    "x": 662,
+    "y": 120,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "bakery-11": {
+    "x": 662,
+    "y": 160,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "theatre-11": {
+    "x": 662,
+    "y": 200,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "grocery-11": {
+    "x": 662,
+    "y": 240,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "town-hall-11": {
+    "x": 662,
+    "y": 280,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "rail-metro-11": {
+    "x": 662,
+    "y": 320,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "triangle-11": {
+    "x": 662,
+    "y": 360,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "hairdresser-11": {
+    "x": 662,
+    "y": 400,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "triangle-stroked-11": {
+    "x": 662,
+    "y": 440,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "bank-11": {
+    "x": 662,
+    "y": 480,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "dentist-11": {
+    "x": 662,
+    "y": 520,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "harbor-11": {
+    "x": 662,
+    "y": 560,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "hospital-11": {
+    "x": 0,
+    "y": 636,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "cafe-11": {
+    "x": 40,
+    "y": 636,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "pharmacy-11": {
+    "x": 80,
+    "y": 636,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "ice-cream-11": {
+    "x": 120,
+    "y": 636,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "america-football-11": {
+    "x": 160,
+    "y": 636,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "bicycle-11": {
+    "x": 200,
+    "y": 636,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "baseball-11": {
+    "x": 240,
+    "y": 636,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "laundry-11": {
+    "x": 280,
+    "y": 636,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "basketball-11": {
+    "x": 320,
+    "y": 636,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "college-11": {
+    "x": 360,
+    "y": 636,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "campsite-11": {
+    "x": 400,
+    "y": 636,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "library-11": {
+    "x": 440,
+    "y": 636,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "cemetery-11": {
+    "x": 480,
+    "y": 636,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "car-11": {
+    "x": 520,
+    "y": 636,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "dog-park-11": {
+    "x": 560,
+    "y": 636,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "lodging-11": {
+    "x": 600,
+    "y": 636,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "golf-11": {
+    "x": 640,
+    "y": 636,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "rail-light-11": {
+    "x": 702,
+    "y": 0,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "park-11": {
+    "x": 702,
+    "y": 40,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "marker-11": {
+    "x": 702,
+    "y": 80,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "cinema-11": {
+    "x": 702,
+    "y": 120,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "monument-11": {
+    "x": 702,
+    "y": 160,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "playground-11": {
+    "x": 702,
+    "y": 200,
+    "width": 38,
+    "height": 38,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-highway-3-small": {
+    "x": 0,
+    "y": 676,
+    "width": 50,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-highway-1-small": {
+    "x": 702,
+    "y": 240,
+    "width": 34,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "dlr-11": {
+    "x": 702,
+    "y": 278,
+    "width": 36,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "dlr.london-overground.london-underground.national-rail-11": {
+    "x": 52,
+    "y": 676,
+    "width": 148,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "dlr.london-underground-11": {
+    "x": 202,
+    "y": 676,
+    "width": 76,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "default-6-large": {
+    "x": 280,
+    "y": 676,
+    "width": 100,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "dlr.london-underground.national-rail-11": {
+    "x": 382,
+    "y": 676,
+    "width": 112,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "dlr.national-rail-11": {
+    "x": 496,
+    "y": 676,
+    "width": 76,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "default-5-large": {
+    "x": 574,
+    "y": 676,
+    "width": 90,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "london-overground-11": {
+    "x": 702,
+    "y": 316,
+    "width": 36,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "default-4-large": {
+    "x": 742,
+    "y": 0,
+    "width": 78,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "london-overground.london-underground-11": {
+    "x": 742,
+    "y": 38,
+    "width": 76,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "default-3-large": {
+    "x": 742,
+    "y": 76,
+    "width": 65,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "london-overground.london-underground.national-rail-11": {
+    "x": 0,
+    "y": 714,
+    "width": 112,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "default-2-large": {
+    "x": 742,
+    "y": 114,
+    "width": 50,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-state-6-large": {
+    "x": 114,
+    "y": 714,
+    "width": 108,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "default-1-large": {
+    "x": 742,
+    "y": 152,
+    "width": 36,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "weiner-linien-11": {
+    "x": 780,
+    "y": 152,
+    "width": 36,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "transilien-11": {
+    "x": 742,
+    "y": 190,
+    "width": 36,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "s-bahn-11": {
+    "x": 780,
+    "y": 190,
+    "width": 36,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "rer.transilien-11": {
+    "x": 742,
+    "y": 228,
+    "width": 76,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "rer-11": {
+    "x": 742,
+    "y": 266,
+    "width": 36,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "national-rail-11": {
+    "x": 780,
+    "y": 266,
+    "width": 36,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "moscow-metro-11": {
+    "x": 742,
+    "y": 304,
+    "width": 36,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "metro.rer-11": {
+    "x": 742,
+    "y": 342,
+    "width": 76,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-state-5-large": {
+    "x": 224,
+    "y": 714,
+    "width": 96,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "london-underground.national-rail-11": {
+    "x": 742,
+    "y": 380,
+    "width": 76,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-highway-2-small": {
+    "x": 742,
+    "y": 418,
+    "width": 42,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "london-overground.national-rail-11": {
+    "x": 742,
+    "y": 456,
+    "width": 76,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-state-1-large": {
+    "x": 742,
+    "y": 494,
+    "width": 44,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-state-4-large": {
+    "x": 322,
+    "y": 714,
+    "width": 84,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-state-2-large": {
+    "x": 742,
+    "y": 532,
+    "width": 56,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-state-3-large": {
+    "x": 742,
+    "y": 570,
+    "width": 70,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "london-underground-11": {
+    "x": 780,
+    "y": 304,
+    "width": 36,
+    "height": 36,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-highway-duplex-3-small": {
+    "x": 742,
+    "y": 608,
+    "width": 54,
+    "height": 34,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-highway-duplex-4-small": {
+    "x": 742,
+    "y": 644,
+    "width": 56,
+    "height": 34,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-highway-duplex-5-small": {
+    "x": 666,
+    "y": 676,
+    "width": 58,
+    "height": 34,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "marsh-16": {
+    "x": 786,
+    "y": 418,
+    "width": 32,
+    "height": 32,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "entrance-11": {
+    "x": 788,
+    "y": 494,
+    "width": 32,
+    "height": 32,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "default-1-small": {
+    "x": 742,
+    "y": 680,
+    "width": 30,
+    "height": 30,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-state-2-small": {
+    "x": 774,
+    "y": 680,
+    "width": 46,
+    "height": 30,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "default-2-small": {
+    "x": 408,
+    "y": 714,
+    "width": 42,
+    "height": 30,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "default-3-small": {
+    "x": 452,
+    "y": 714,
+    "width": 54,
+    "height": 30,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "default-4-small": {
+    "x": 508,
+    "y": 714,
+    "width": 66,
+    "height": 30,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-state-3-small": {
+    "x": 576,
+    "y": 714,
+    "width": 58,
+    "height": 30,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "default-5-small": {
+    "x": 636,
+    "y": 714,
+    "width": 76,
+    "height": 30,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-state-5-small": {
+    "x": 714,
+    "y": 714,
+    "width": 80,
+    "height": 30,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-state-6-small": {
+    "x": 0,
+    "y": 752,
+    "width": 90,
+    "height": 30,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "default-6-small": {
+    "x": 92,
+    "y": 752,
+    "width": 88,
+    "height": 30,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-state-4-small": {
+    "x": 182,
+    "y": 752,
+    "width": 70,
+    "height": 30,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "us-state-1-small": {
+    "x": 702,
+    "y": 354,
+    "width": 34,
+    "height": 30,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "metro-11": {
+    "x": 702,
+    "y": 386,
+    "width": 28,
+    "height": 28,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "oneway-spaced-white-large": {
+    "x": 702,
+    "y": 416,
+    "width": 28,
+    "height": 12,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "oneway-spaced-large": {
+    "x": 702,
+    "y": 430,
+    "width": 28,
+    "height": 12,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "oneway-spaced-small": {
+    "x": 794,
+    "y": 114,
+    "width": 22,
+    "height": 10,
+    "pixelRatio": 2,
+    "sdf": false
+  },
+  "oneway-spaced-white-small": {
+    "x": 794,
+    "y": 126,
+    "width": 22,
+    "height": 10,
+    "pixelRatio": 2,
+    "sdf": false
+  }
+}
\ No newline at end of file
diff --git a/ios/benchmark/assets/sprites/mapbox-streets@2x.png b/ios/benchmark/assets/sprites/mapbox-streets@2x.png
new file mode 100644
index 000000000..0d5bd533f
Binary files /dev/null and b/ios/benchmark/assets/sprites/mapbox-streets@2x.png differ
diff --git a/ios/benchmark/assets/styles/mapbox-streets-v7.json b/ios/benchmark/assets/styles/mapbox-streets-v7.json
new file mode 100644
index 000000000..62e0f6669
--- /dev/null
+++ b/ios/benchmark/assets/styles/mapbox-streets-v7.json
@@ -0,0 +1,3917 @@
+{
+  "version": 7,
+  "name": "mapbox-streets",
+  "constants": {
+    "@poi-scalerank3": {
+      "base": 1,
+      "stops": [[16, 11], [20, 13]]
+    },
+    "@label-neighbourhood": "#805540",
+    "@hillshade-shadow": "#5a5517",
+    "@road-width-minor": {
+      "base": 1.5,
+      "stops": [[14, 0.5], [18, 12]]
+    },
+    "@poi-scalerank4": {
+      "base": 1,
+      "stops": [[16, 11], [20, 13]]
+    },
+    "@wetlands": "#9DD3D8",
+    "@landuse-cemetery": "#dde6c2",
+    "@admin-2-boundary": {
+      "base": 1,
+      "stops": [[3, 0.5], [10, 2]]
+    },
+    "@snow": "#fff",
+    "@path-opacity": {
+      "base": 1,
+      "stops": [[15, 0], [15.25, 1]]
+    },
+    "@label-park": "#4c661f",
+    "@landuse-school": "#f3ebb4",
+    "@label-water-dark": "#004087",
+    "@road-main": "#a2a2a2",
+    "@road-case-dark": "#d9d3c9",
+    "@path-bg-width": {
+      "base": 1.5,
+      "stops": [[15, 2], [18, 7]]
+    },
+    "@road-trunk": "#f2cf60",
+    "@road-motorway": "#ffa159",
+    "@road-minor": "#fff",
+    "@rail-track-width": {
+      "base": 1.5,
+      "stops": [[14, 4], [20, 8]]
+    },
+    "@label-primary": "#000000",
+    "@street-high-opacity": {
+      "base": 1,
+      "stops": [[13.99, 0], [14, 1]]
+    },
+    "@label-city-lg-size": {
+      "base": 0.9,
+      "stops": [[4, 12], [10, 22]]
+    },
+    "@landuse-industrial": "#e0dae0",
+    "@landcover-opacity": {
+      "base": 1.5,
+      "stops": [[2, 0.3], [14, 0]]
+    },
+    "@rail-width": {
+      "base": 1.5,
+      "stops": [[14, 0.5], [20, 1]]
+    },
+    "@landuse-hospital": "#f4dcdc",
+    "@land": "#ede9d9",
+    "@name": "{name_en}",
+    "@landcover": "#ddecb1",
+    "@tunnel-case-dark": "#c4beb7",
+    "@aeroway": "#dbcedb",
+    "@label-city-md-size": {
+      "base": 0.9,
+      "stops": [[5, 12], [12, 22]]
+    },
+    "@tunnel-trunk": "#f2de9e",
+    "@landuse-pitch": "#c3e194",
+    "@admin": "#787680",
+    "@road-case-width-sm": {
+      "base": 1.5,
+      "stops": [[12, 0.75], [20, 2]]
+    },
+    "@label-poi": "#65513d",
+    "@main-width": {
+      "base": 1.5,
+      "stops": [[8.5, 0.5], [10, 0.75], [18, 26]]
+    },
+    "@road-case-width-lg": {
+      "base": 1.5,
+      "stops": [[5, 0.75], [16, 2]]
+    },
+    "@road-high-z-fadein": {
+      "base": 1.2,
+      "stops": [[5, 0], [5.5, 1]]
+    },
+    "@rail": "#b3ada6",
+    "@country-halo": "rgba(255,255,255,0.75)",
+    "@hillshade-highlight": "#fff",
+    "@motorway-width": {
+      "base": 1.5,
+      "stops": [[5, 0.75], [18, 32]]
+    },
+    "@country-label-color": {
+      "stops": [[8, "#000000"], [10, "#888888"]],
+      "base": 1
+    },
+    "@building": "#e8e0cc",
+    "@landuse-sand": "#ededcf",
+    "@road-trunk-case": "#fff",
+    "@ramp-1": {
+      "base": 1,
+      "stops": [[0, [1, 2]], [20, [1, 0.25]]]
+    },
+    "@road-motorway-case": "#fff",
+    "@street_limited-width": {
+      "base": 1.5,
+      "stops": [[12.5, 0.5], [14, 2], [18, 12]]
+    },
+    "@water": "#8ccbf7",
+    "@ramp-2": {
+      "base": 1,
+      "stops": [[14, [0.4, 0.4]], [15, [0.3, 0.3]], [16, [0.2, 0.2]], [18, [0.15, 0.15]], [19, [0.1, 0.1]]]
+    },
+    "@label-state": "#242424",
+    "@landuse-parks": "#cde8a2",
+    "@street_limited-case-width": {
+      "base": 1.5,
+      "stops": [[13, 0], [14, 2], [18, 12]]
+    },
+    "@motorway_link-width": {
+      "base": 1.5,
+      "stops": [[12, 0.5], [14, 2], [18, 18]]
+    },
+    "@building-shadow": "#cbc6b7",
+    "@label-road": "#3a3836",
+    "@rail-low": "#ccc5bd",
+    "@label-transit": "#000000",
+    "@rail-lowhigh": {
+      "stops": [[13, "#d8d5c8"], [16, "#b3b1a6"]]
+    },
+    "@street-case-gap-width": {
+      "base": 1.5,
+      "stops": [[13, 0], [14, 2], [18, 18]]
+    },
+    "@halo": "#ffffff",
+    "@street-width": {
+      "base": 1.5,
+      "stops": [[12.5, 0.5], [14, 2], [18, 18]]
+    },
+    "@main-case-width": {
+      "base": 1.2,
+      "stops": [[10, 0.75], [18, 2]]
+    },
+    "@road-street-limited": "#EFEDEB",
+    "@landuse-glacier": "#dcedf9",
+    "@label-water": "#c8e5f9",
+    "@poi-scalerank1": {
+      "base": 1,
+      "stops": [[10, 11], [18, 14]]
+    },
+    "@path-width": {
+      "base": 1.5,
+      "stops": [[15, 1], [18, 4]]
+    },
+    "@tunnel-motorway": "#ffbe8c",
+    "@poi-scalerank2": {
+      "base": 1,
+      "stops": [[14, 11], [20, 14]]
+    }
+  },
+  "sources": {
+    "mapbox://mapbox.mapbox-streets-v6": {
+      "url": "asset://tiles/mapbox.mapbox-streets-v6.json",
+      "type": "vector"
+    },
+    "mapbox://mapbox.mapbox-terrain-v2": {
+      "url": "asset://tiles/mapbox.mapbox-terrain-v2.json",
+      "type": "vector"
+    }
+  },
+  "sprite": "asset://sprites/mapbox-streets",
+  "glyphs": "asset://glyphs/{fontstack}/{range}.pbf",
+  "layers": [{
+    "id": "background",
+    "type": "background",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "background-color": "@land"
+    }
+  }, {
+    "id": "landcover_crop",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-terrain-v2",
+    "source-layer": "landcover",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "crop"]],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "@landcover",
+      "fill-opacity": "@landcover-opacity",
+      "fill-antialias": false
+    }
+  }, {
+    "id": "landcover_grass",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-terrain-v2",
+    "source-layer": "landcover",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "grass"]],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "@landcover",
+      "fill-opacity": "@landcover-opacity",
+      "fill-antialias": false
+    }
+  }, {
+    "id": "landcover_scrub",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-terrain-v2",
+    "source-layer": "landcover",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "scrub"]],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "@landcover",
+      "fill-opacity": "@landcover-opacity",
+      "fill-antialias": false
+    }
+  }, {
+    "id": "landcover_wood",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-terrain-v2",
+    "source-layer": "landcover",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "wood"]],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "@landcover",
+      "fill-opacity": "@landcover-opacity",
+      "fill-antialias": false
+    }
+  }, {
+    "id": "landcover_snow",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-terrain-v2",
+    "source-layer": "landcover",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "snow"]],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "@snow",
+      "fill-opacity": 0.2,
+      "fill-antialias": false
+    }
+  }, {
+    "id": "parks",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "landuse",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "park"]],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "@landuse-parks",
+      "fill-opacity": {
+        "base": 1,
+        "stops": [[5, 0], [6, 1]]
+      }
+    }
+  }, {
+    "id": "scrub",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "landuse",
+    "minzoom": 9,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "scrub"]],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "@landcover",
+      "fill-opacity": {
+        "base": 1,
+        "stops": [[9, 0], [16, 0.2]]
+      }
+    }
+  }, {
+    "id": "grass",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "landuse",
+    "minzoom": 9,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "grass"]],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "@landcover",
+      "fill-opacity": {
+        "base": 1,
+        "stops": [[9, 0], [16, 0.4]]
+      }
+    }
+  }, {
+    "id": "wood",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "landuse",
+    "minzoom": 6,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "wood"]],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "@landcover",
+      "fill-opacity": {
+        "base": 1,
+        "stops": [[6, 0], [16, 0.5]]
+      }
+    }
+  }, {
+    "id": "hospital",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "landuse",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "hospital"]],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "@landuse-hospital"
+    }
+  }, {
+    "id": "glaciers",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "landuse",
+    "minzoom": 9,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "glacier"]],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "@landuse-glacier",
+      "fill-opacity": {
+        "base": 1,
+        "stops": [[9, 0], [10, 0.25]]
+      }
+    }
+  }, {
+    "id": "pitch",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "landuse",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "pitch"]],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "@landuse-pitch"
+    }
+  }, {
+    "id": "pitch-line",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "landuse",
+    "minzoom": 15,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "pitch"]],
+    "layout": {},
+    "paint": {
+      "line-color": "#e1f2c6"
+    }
+  }, {
+    "id": "school",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "landuse",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "school"]],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "@landuse-school"
+    }
+  }, {
+    "id": "cemetery",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "landuse",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "cemetery"]],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "@landuse-cemetery"
+    }
+  }, {
+    "id": "industrial",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "landuse",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "industrial"]],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "@landuse-industrial"
+    }
+  }, {
+    "id": "sand",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "landuse",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "sand"]],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "@landuse-sand"
+    }
+  }, {
+    "id": "hillshade_highlight_bright",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-terrain-v2",
+    "source-layer": "hillshade",
+    "filter": ["all", ["==", "level", 94]],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "@hillshade-highlight",
+      "fill-opacity": {
+        "stops": [[15, 0.12], [18, 0]]
+      },
+      "fill-antialias": false
+    }
+  }, {
+    "id": "hillshade_highlight_med",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-terrain-v2",
+    "source-layer": "hillshade",
+    "filter": ["all", ["==", "level", 90]],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "@hillshade-highlight",
+      "fill-opacity": {
+        "stops": [[15, 0.12], [18, 0]]
+      },
+      "fill-antialias": false
+    }
+  }, {
+    "id": "hillshade_shadow_faint",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-terrain-v2",
+    "source-layer": "hillshade",
+    "filter": ["all", ["==", "level", 89]],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "@hillshade-shadow",
+      "fill-opacity": {
+        "stops": [[15, 0.05], [17, 0]]
+      },
+      "fill-antialias": false
+    }
+  }, {
+    "id": "hillshade_shadow_med",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-terrain-v2",
+    "source-layer": "hillshade",
+    "filter": ["all", ["==", "level", 78]],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "@hillshade-shadow",
+      "fill-opacity": {
+        "stops": [[15, 0.05], [17, 0]]
+      },
+      "fill-antialias": false
+    }
+  }, {
+    "id": "hillshade_shadow_dark",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-terrain-v2",
+    "source-layer": "hillshade",
+    "filter": ["all", ["==", "level", 67]],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "@hillshade-shadow",
+      "fill-opacity": {
+        "stops": [[15, 0.06], [17, 0]]
+      },
+      "fill-antialias": false
+    }
+  }, {
+    "id": "hillshade_shadow_extreme",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-terrain-v2",
+    "source-layer": "hillshade",
+    "filter": ["all", ["==", "level", 56]],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "@hillshade-shadow",
+      "fill-opacity": {
+        "stops": [[15, 0.06], [17, 0]]
+      },
+      "fill-antialias": false
+    }
+  }, {
+    "id": "waterway-river",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "waterway",
+    "minzoom": 8,
+    "maxzoom": 22,
+    "filter": ["any", ["==", "class", "river"], ["==", "class", "canal"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": {
+        "base": 1,
+        "stops": [[0, "butt"], [11, "round"]]
+      },
+      "line-join": "round"
+    },
+    "paint": {
+      "line-color": "@water",
+      "line-width": {
+        "base": 1.3,
+        "stops": [[8.5, 0.1], [20, 8]]
+      },
+      "line-opacity": {
+        "base": 1,
+        "stops": [[8, 0], [8.5, 1]]
+      }
+    }
+  }, {
+    "id": "waterway-other",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "waterway",
+    "minzoom": 13,
+    "maxzoom": 22,
+    "filter": ["all", ["!=", "class", "river"], ["!=", "class", "canal"]],
+    "layout": {
+      "visibility": "visible",
+      "line-join": "round",
+      "line-cap": "round"
+    },
+    "paint": {
+      "line-color": "@water",
+      "line-width": {
+        "base": 1.35,
+        "stops": [[13.5, 0.1], [20, 3]]
+      },
+      "line-opacity": {
+        "base": 1,
+        "stops": [[13, 0], [13.5, 1]]
+      }
+    }
+  }, {
+    "id": "water",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "water",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "@water"
+    }
+  }, {
+    "id": "landuse-overlay",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "landuse_overlay",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all"],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "@wetlands",
+      "fill-opacity": {
+        "base": 1,
+        "stops": [[10, 0.25], [10.5, 0.15]]
+      }
+    }
+  }, {
+    "id": "landuse-overlay-pattern",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "landuse_overlay",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all"],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "@wetlands",
+      "fill-opacity": {
+        "base": 1,
+        "stops": [[10, 0], [10.5, 1]]
+      },
+      "fill-image": {
+        "base": 1,
+        "stops": [[13, "marsh-16"], [14, "marsh-32"]]
+      }
+    }
+  }, {
+    "id": "barrier_line-land-polygon",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "barrier_line",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "land"], ["==", "$type", "Polygon"]],
+    "layout": {},
+    "paint": {
+      "fill-color": "@land"
+    }
+  }, {
+    "id": "barrier_line-land-line",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "barrier_line",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "land"], ["==", "$type", "LineString"]],
+    "layout": {
+      "line-cap": "round"
+    },
+    "paint": {
+      "line-width": {
+        "base": 1.99,
+        "stops": [[14, 0.75], [20, 40]]
+      },
+      "line-color": "@land"
+    }
+  }, {
+    "id": "building-bottom",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "building",
+    "minzoom": 15,
+    "maxzoom": 22,
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "@building-shadow",
+      "fill-opacity": {
+        "base": 1,
+        "stops": [[15.5, 0], [16, 1]]
+      }
+    }
+  }, {
+    "id": "building-top",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "building",
+    "minzoom": 15,
+    "maxzoom": 22,
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": {
+        "base": 1,
+        "stops": [[15, "@land"], [16, "@building"]]
+      },
+      "fill-opacity": {
+        "base": 1,
+        "stops": [[15, 0], [15.5, 1]]
+      },
+      "fill-outline-color": "#d0cbbb",
+      "fill-translate": {
+        "base": 1,
+        "stops": [[15, [0, 0]], [20, [-5, -5]]]
+      }
+    }
+  }, {
+    "id": "aeroway-polygon",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "aeroway",
+    "minzoom": 11,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "$type", "Polygon"], ["!=", "type", "apron"]],
+    "layout": {},
+    "paint": {
+      "fill-color": "@aeroway",
+      "fill-opacity": {
+        "base": 1,
+        "stops": [[11, 0], [11.5, 1]]
+      }
+    }
+  }, {
+    "id": "aeroway-runway",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "aeroway",
+    "minzoom": 9,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "type", "runway"], ["==", "$type", "LineString"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "butt"
+    },
+    "paint": {
+      "line-color": "@aeroway",
+      "line-width": {
+        "base": 1.5,
+        "stops": [[9, 1], [18, 80]]
+      }
+    }
+  }, {
+    "id": "aeroway-taxiway",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "aeroway",
+    "minzoom": 9,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "type", "taxiway"], ["==", "$type", "LineString"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "butt"
+    },
+    "paint": {
+      "line-color": "@aeroway",
+      "line-width": {
+        "base": 1.5,
+        "stops": [[10, 0.5], [18, 20]]
+      }
+    }
+  }, {
+    "id": "admin-3-4-boundaries-bg",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "admin",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", [">=", "admin_level", 3], ["==", "maritime", 0]],
+    "layout": {
+      "visibility": "visible",
+      "line-join": "bevel"
+    },
+    "paint": {
+      "line-color": {
+        "base": 1,
+        "stops": [[8, "@land"], [16, "#f6e8e1"]]
+      },
+      "line-width": {
+        "base": 1,
+        "stops": [[3, 3.5], [10, 8]]
+      },
+      "line-opacity": {
+        "base": 1,
+        "stops": [[7, 0], [8, 0.75]]
+      },
+      "line-dasharray": [1, 0],
+      "line-translate": [0, 0],
+      "line-blur": {
+        "base": 1,
+        "stops": [[3, 0], [8, 3]]
+      }
+    }
+  }, {
+    "id": "tunnel-street_limited-polygon",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "tunnel",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "street_limited"], ["==", "$type", "Polygon"]],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "#EEE8E3",
+      "fill-opacity": 0.75
+    }
+  }, {
+    "id": "tunnel-path-bg",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "tunnel",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "path"]],
+    "layout": {
+      "visibility": "none",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@path-bg-width",
+      "line-dasharray": [1, 0],
+      "line-color": "@road-case-dark",
+      "line-blur": 0,
+      "line-opacity": {
+        "base": 1,
+        "stops": [[15, 0], [15.25, 0.5]]
+      }
+    }
+  }, {
+    "id": "tunnel-path",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "tunnel",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "path"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@path-width",
+      "line-dasharray": {
+        "base": 1,
+        "stops": [[15, [0.1, 1.25]], [16, [0.1, 1.6]], [17, [0.1, 1.45]], [18, [0.1, 1.3]]]
+      },
+      "line-color": "#f5f2ee",
+      "line-opacity": "@path-opacity"
+    }
+  }, {
+    "id": "tunnel-street-low",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "tunnel",
+    "minzoom": 11,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "street"], ["==", "$type", "LineString"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@street-width",
+      "line-color": "@road-minor",
+      "line-opacity": {
+        "stops": [[11.5, 0], [12, 1], [14, 1], [14.01, 0]]
+      }
+    }
+  }, {
+    "id": "tunnel-street_limited-low",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "tunnel",
+    "minzoom": 11,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "street_limited"], ["==", "$type", "LineString"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@street-width",
+      "line-color": "@road-minor",
+      "line-opacity": {
+        "stops": [[11.5, 0], [12, 1], [14, 1], [14.01, 0]]
+      }
+    }
+  }, {
+    "id": "tunnel-motorway_link-case",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "tunnel",
+    "minzoom": 11,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "motorway_link"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@road-case-width-sm",
+      "line-color": "@road-motorway-case",
+      "line-gap-width": "@motorway_link-width",
+      "line-dasharray": [3, 3]
+    }
+  }, {
+    "id": "tunnel-service-driveway-case",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "tunnel",
+    "minzoom": 15,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "service", "driveway"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@road-case-width-sm",
+      "line-color": "@tunnel-case-dark",
+      "line-gap-width": "@road-width-minor",
+      "line-dasharray": [3, 3]
+    }
+  }, {
+    "id": "tunnel-street_limited-case",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "tunnel",
+    "minzoom": 11,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "street_limited"], ["==", "$type", "LineString"], ["!=", "type", "construction"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@road-case-width-sm",
+      "line-color": "@tunnel-case-dark",
+      "line-gap-width": "@street_limited-case-width",
+      "line-dasharray": [3, 3],
+      "line-opacity": "@street-high-opacity"
+    }
+  }, {
+    "id": "tunnel-street-case",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "tunnel",
+    "minzoom": 11,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "street"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@road-case-width-sm",
+      "line-color": "@tunnel-case-dark",
+      "line-gap-width": "@street-case-gap-width",
+      "line-dasharray": [3, 3],
+      "line-opacity": "@street-high-opacity"
+    }
+  }, {
+    "id": "tunnel-main-case",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "tunnel",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "main"], ["!=", "type", "trunk"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@main-case-width",
+      "line-dasharray": [3, 3],
+      "line-gap-width": "@main-width",
+      "line-color": "@tunnel-case-dark"
+    }
+  }, {
+    "id": "tunnel-trunk-case",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "tunnel",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "main"], ["==", "type", "trunk"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@road-case-width-lg",
+      "line-color": "@road-motorway-case",
+      "line-gap-width": "@motorway-width",
+      "line-opacity": 1,
+      "line-dasharray": [3, 3]
+    }
+  }, {
+    "id": "tunnel-motorway-case",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "tunnel",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "motorway"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@road-case-width-lg",
+      "line-color": "@road-motorway-case",
+      "line-gap-width": "@motorway-width",
+      "line-opacity": 1,
+      "line-dasharray": [3, 3]
+    }
+  }, {
+    "id": "tunnel-motorway_link",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "tunnel",
+    "minzoom": 11,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "motorway_link"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@motorway_link-width",
+      "line-color": "@tunnel-motorway",
+      "line-opacity": 1,
+      "line-dasharray": [1, 0]
+    }
+  }, {
+    "id": "tunnel-service-driveway",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "tunnel",
+    "minzoom": 15,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "service", "driveway"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@road-width-minor",
+      "line-color": "@road-minor",
+      "line-dasharray": [1, 0]
+    }
+  }, {
+    "id": "tunnel-construction",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "tunnel",
+    "minzoom": 14,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "street_limited"], ["==", "$type", "LineString"], ["==", "type", "construction"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "butt",
+      "line-join": "miter"
+    },
+    "paint": {
+      "line-width": "@street_limited-width",
+      "line-color": "@road-case-dark",
+      "line-opacity": "@street-high-opacity",
+      "line-dasharray": {
+        "base": 1,
+        "stops": [[14, [0.4, 0.8]], [15, [0.3, 0.6]], [16, [0.2, 0.3]], [17, [0.2, 0.25]], [18, [0.15, 0.15]]]
+      }
+    }
+  }, {
+    "id": "tunnel-street_limited",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "tunnel",
+    "minzoom": 11,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "street_limited"], ["==", "$type", "LineString"], ["!=", "type", "construction"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@street_limited-width",
+      "line-color": "@road-street-limited",
+      "line-opacity": "@street-high-opacity"
+    }
+  }, {
+    "id": "tunnel-street",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "tunnel",
+    "minzoom": 11,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "street"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@street-width",
+      "line-color": "@road-minor",
+      "line-opacity": "@street-high-opacity"
+    }
+  }, {
+    "id": "tunnel-main",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "tunnel",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "main"], ["!=", "type", "trunk"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@main-width",
+      "line-color": "@road-minor",
+      "line-opacity": 1,
+      "line-dasharray": [1, 0],
+      "line-blur": 0
+    }
+  }, {
+    "id": "tunnel-trunk",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "tunnel",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "main"], ["==", "type", "trunk"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@motorway-width",
+      "line-color": "@tunnel-trunk"
+    }
+  }, {
+    "id": "tunnel-motorway",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "tunnel",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "motorway"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@motorway-width",
+      "line-dasharray": [1, 0],
+      "line-opacity": 1,
+      "line-color": "@tunnel-motorway",
+      "line-blur": 0
+    }
+  }, {
+    "id": "tunnel-oneway-arrows-white",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "tunnel",
+    "minzoom": 15,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "oneway", 1], ["any", ["in", "class", "motorway", "motorway_link"], ["in", "type", "trunk"]]],
+    "layout": {
+      "symbol-min-distance": 250,
+      "symbol-placement": "line",
+      "icon-image": {
+        "base": 1,
+        "stops": [[16, "oneway-spaced-white-small"], [17, "oneway-spaced-white-large"]]
+      },
+      "icon-ignore-placement": true
+    },
+    "paint": {}
+  }, {
+    "id": "tunnel-oneway-arrows-color",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "tunnel",
+    "minzoom": 15,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "oneway", 1], ["in", "class", "main", "street", "street_limited"], ["!=", "type", "trunk"]],
+    "layout": {
+      "symbol-min-distance": 250,
+      "symbol-placement": "line",
+      "icon-image": {
+        "base": 1,
+        "stops": [[16, "oneway-spaced-small"], [17, "oneway-spaced-large"]]
+      },
+      "icon-ignore-placement": true
+    },
+    "paint": {}
+  }, {
+    "id": "tunnel-rail",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "tunnel",
+    "minzoom": 13,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "major_rail", "minor_rail"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "butt"
+    },
+    "paint": {
+      "line-color": {
+        "stops": [[13, "#d8d5c8"], [16, "#c0beb2"]]
+      },
+      "line-width": "@rail-width"
+    }
+  }, {
+    "id": "tunnel-rail-tracks",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "tunnel",
+    "minzoom": 13,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "major_rail", "minor_rail"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "butt"
+    },
+    "paint": {
+      "line-color": {
+        "stops": [[13, "#d8d5c8"], [16, "#c0beb2"]]
+      },
+      "line-width": "@rail-track-width",
+      "line-dasharray": [0.1, 15],
+      "line-opacity": {
+        "base": 1,
+        "stops": [[13.75, 0], [20, 1]]
+      }
+    }
+  }, {
+    "id": "road-path-bg",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "path"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@path-bg-width",
+      "line-dasharray": [1, 0],
+      "line-color": "@road-case-dark",
+      "line-blur": 0,
+      "line-opacity": {
+        "base": 1,
+        "stops": [[15, 0], [15.25, 0.5]]
+      }
+    }
+  }, {
+    "id": "road-path",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "path"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@path-width",
+      "line-color": "@road-minor",
+      "line-dasharray": {
+        "base": 1,
+        "stops": [[15, [0.1, 1.25]], [16, [0.1, 1.6]], [17, [0.1, 1.45]], [18, [0.1, 1.3]]]
+      },
+      "line-opacity": "@path-opacity"
+    }
+  }, {
+    "id": "road-street_limited-polygon-outline",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road",
+    "minzoom": 12,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "street_limited"], ["==", "$type", "Polygon"]],
+    "layout": {
+      "visibility": "none"
+    },
+    "paint": {
+      "line-color": "@road-case-dark",
+      "line-width": {
+        "base": 1.5,
+        "stops": [[12, 1.5], [20, 4]]
+      },
+      "line-opacity": 1
+    }
+  }, {
+    "id": "road-street-low",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road",
+    "minzoom": 11,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "street"], ["==", "$type", "LineString"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@street-width",
+      "line-color": "@road-minor",
+      "line-opacity": {
+        "stops": [[11, 0], [11.25, 1], [14, 1], [14.01, 0]]
+      }
+    }
+  }, {
+    "id": "road-street_limited-low",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road",
+    "minzoom": 11,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "street_limited"], ["==", "$type", "LineString"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@street-width",
+      "line-color": "@road-minor",
+      "line-opacity": {
+        "stops": [[11, 0], [11.25, 1], [14, 1], [14.01, 0]]
+      }
+    }
+  }, {
+    "id": "road-motorway_link-case",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road",
+    "minzoom": 10,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "motorway_link"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@road-case-width-sm",
+      "line-color": "@road-motorway-case",
+      "line-gap-width": "@motorway_link-width",
+      "line-opacity": {
+        "base": 1,
+        "stops": [[10.99, 0], [11, 1]]
+      }
+    }
+  }, {
+    "id": "road-service-driveway-case",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road",
+    "minzoom": 15,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "service", "driveway"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@road-case-width-sm",
+      "line-color": "@road-case-dark",
+      "line-gap-width": "@road-width-minor"
+    }
+  }, {
+    "id": "road-street_limited-case",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road",
+    "minzoom": 11,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "street_limited"], ["==", "$type", "LineString"], ["!=", "type", "construction"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@road-case-width-sm",
+      "line-color": "@road-case-dark",
+      "line-gap-width": "@street_limited-case-width",
+      "line-opacity": "@street-high-opacity"
+    }
+  }, {
+    "id": "road-street-case",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road",
+    "minzoom": 11,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "street"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@road-case-width-sm",
+      "line-color": "@road-case-dark",
+      "line-gap-width": "@street-case-gap-width",
+      "line-opacity": "@street-high-opacity"
+    }
+  }, {
+    "id": "road-main-case",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "main"], ["!=", "type", "trunk"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@main-case-width",
+      "line-color": "@road-case-dark",
+      "line-gap-width": "@main-width",
+      "line-opacity": {
+        "base": 1,
+        "stops": [[9.99, 0], [10, 1]]
+      }
+    }
+  }, {
+    "id": "road-trunk-case",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road",
+    "minzoom": 5,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "main"], ["in", "type", "trunk"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@road-case-width-lg",
+      "line-color": "@road-trunk-case",
+      "line-gap-width": "@motorway-width",
+      "line-opacity": {
+        "base": 1,
+        "stops": [[5.9, 0], [6, 1]]
+      }
+    }
+  }, {
+    "id": "road-motorway-case",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "motorway"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@road-case-width-lg",
+      "line-color": "@road-motorway-case",
+      "line-gap-width": "@motorway-width",
+      "line-opacity": {
+        "base": 1.2,
+        "stops": [[5.9, 0], [6, 1]]
+      }
+    }
+  }, {
+    "id": "road-street_limited-polygon",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road",
+    "minzoom": 12,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "street_limited"], ["==", "$type", "Polygon"]],
+    "layout": {
+      "visibility": "none"
+    },
+    "paint": {
+      "fill-color": "@road-street-limited",
+      "fill-opacity": 1
+    }
+  }, {
+    "id": "road-service-driveway",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road",
+    "minzoom": 15,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "service", "driveway"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@road-width-minor",
+      "line-color": "@road-minor"
+    }
+  }, {
+    "id": "road-motorway_link",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road",
+    "minzoom": 10,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "motorway_link"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@motorway_link-width",
+      "line-color": "@road-motorway",
+      "line-opacity": 1
+    }
+  }, {
+    "id": "road-construction",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road",
+    "minzoom": 14,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "street_limited"], ["==", "$type", "LineString"], ["==", "type", "construction"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "butt",
+      "line-join": "miter"
+    },
+    "paint": {
+      "line-width": "@street_limited-width",
+      "line-color": "@road-case-dark",
+      "line-opacity": "@street-high-opacity",
+      "line-dasharray": {
+        "base": 1,
+        "stops": [[14, [0.4, 0.8]], [15, [0.3, 0.6]], [16, [0.2, 0.3]], [17, [0.2, 0.25]], [18, [0.15, 0.15]]]
+      }
+    }
+  }, {
+    "id": "road-street_limited",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road",
+    "minzoom": 11,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "street_limited"], ["==", "$type", "LineString"], ["!=", "type", "construction"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@street_limited-width",
+      "line-color": "@road-street-limited",
+      "line-opacity": "@street-high-opacity"
+    }
+  }, {
+    "id": "road-street",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road",
+    "minzoom": 11,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "street"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@street-width",
+      "line-color": "@road-minor",
+      "line-opacity": "@street-high-opacity"
+    }
+  }, {
+    "id": "road-main",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "main"], ["!=", "type", "trunk"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@main-width",
+      "line-color": {
+        "base": 1,
+        "stops": [[5, "@land"], [8, "@road-minor"]]
+      },
+      "line-opacity": "@road-high-z-fadein"
+    }
+  }, {
+    "id": "road-trunk",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road",
+    "minzoom": 5,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "main"], ["==", "type", "trunk"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@motorway-width",
+      "line-color": "@road-trunk"
+    }
+  }, {
+    "id": "road-motorway",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "motorway"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@motorway-width",
+      "line-color": {
+        "base": 1,
+        "stops": [[5.9, "#fff"], [6, "#ffa159"]]
+      },
+      "line-opacity": "@road-high-z-fadein"
+    }
+  }, {
+    "id": "road-oneway-arrows-white",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road",
+    "minzoom": 15,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "oneway", 1], ["any", ["in", "class", "motorway", "motorway_link"], ["in", "type", "trunk"]]],
+    "layout": {
+      "symbol-min-distance": 250,
+      "symbol-placement": "line",
+      "icon-image": {
+        "base": 1,
+        "stops": [[16, "oneway-spaced-white-small"], [17, "oneway-spaced-white-large"]]
+      },
+      "icon-ignore-placement": true
+    },
+    "paint": {}
+  }, {
+    "id": "road-oneway-arrows-color",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road",
+    "minzoom": 15,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "oneway", 1], ["in", "class", "main", "street", "street_limited"], ["!=", "type", "trunk"]],
+    "layout": {
+      "symbol-min-distance": 250,
+      "symbol-placement": "line",
+      "icon-image": {
+        "base": 1,
+        "stops": [[16, "oneway-spaced-small"], [17, "oneway-spaced-large"]]
+      },
+      "icon-ignore-placement": true,
+      "icon-rotation-alignment": "map"
+    },
+    "paint": {}
+  }, {
+    "id": "road-rail",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road",
+    "minzoom": 13,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "major_rail", "minor_rail"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "butt"
+    },
+    "paint": {
+      "line-color": "@rail-lowhigh",
+      "line-width": "@rail-width"
+    }
+  }, {
+    "id": "road-rail-tracks",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road",
+    "minzoom": 13,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "major_rail", "minor_rail"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "butt"
+    },
+    "paint": {
+      "line-color": "@rail-lowhigh",
+      "line-width": "@rail-track-width",
+      "line-dasharray": [0.1, 15],
+      "line-opacity": {
+        "base": 1,
+        "stops": [[13.75, 0], [14, 1]]
+      }
+    }
+  }, {
+    "id": "bridge-street_limited-polygon",
+    "type": "fill",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "bridge",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "street_limited"], ["==", "$type", "Polygon"]],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "fill-color": "#EEE8E3",
+      "fill-opacity": 0.75
+    }
+  }, {
+    "id": "bridge-path-bg",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "bridge",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "path"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@path-bg-width",
+      "line-dasharray": [1, 0],
+      "line-color": "@road-case-dark",
+      "line-blur": 0,
+      "line-opacity": {
+        "base": 1,
+        "stops": [[15, 0], [15.25, 0.75]]
+      }
+    }
+  }, {
+    "id": "bridge-path",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "bridge",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "path"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@path-width",
+      "line-color": "@road-minor",
+      "line-dasharray": {
+        "base": 1,
+        "stops": [[14, [0.1, 1.25]], [16, [0.1, 1.6]], [17, [0.1, 1.45]], [18, [0.1, 1.3]]]
+      },
+      "line-opacity": "@path-opacity"
+    }
+  }, {
+    "id": "bridge-street-low",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "bridge",
+    "minzoom": 11,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "street"], ["==", "$type", "LineString"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@street-width",
+      "line-color": "@road-minor",
+      "line-opacity": {
+        "stops": [[11.5, 0], [12, 1], [14, 1], [14.01, 0]]
+      }
+    }
+  }, {
+    "id": "bridge-street_limited-low",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "bridge",
+    "minzoom": 11,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "street_limited"], ["==", "$type", "LineString"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@street-width",
+      "line-color": "@road-minor",
+      "line-opacity": {
+        "stops": [[11.5, 0], [12, 1], [14, 1], [14.01, 0]]
+      }
+    }
+  }, {
+    "id": "bridge-motorway_link-case",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "bridge",
+    "minzoom": 12,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "motorway_link"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "butt",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@road-case-width-sm",
+      "line-color": "@road-motorway-case",
+      "line-gap-width": "@motorway_link-width",
+      "line-opacity": 1
+    }
+  }, {
+    "id": "bridge-service-driveway-case",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "bridge",
+    "minzoom": 15,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "service", "driveway"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "butt",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@road-case-width-sm",
+      "line-color": "@road-case-dark",
+      "line-gap-width": "@road-width-minor"
+    }
+  }, {
+    "id": "bridge-street_limited-case",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "bridge",
+    "minzoom": 14,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "street_limited"], ["==", "$type", "LineString"], ["!=", "type", "construction"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "butt",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@road-case-width-sm",
+      "line-color": "@road-case-dark",
+      "line-gap-width": "@street_limited-case-width"
+    }
+  }, {
+    "id": "bridge-street-case",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "bridge",
+    "minzoom": 14,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "street"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "butt",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@road-case-width-sm",
+      "line-color": "@road-case-dark",
+      "line-gap-width": "@street-case-gap-width"
+    }
+  }, {
+    "id": "bridge-main-case",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "bridge",
+    "minzoom": 8,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "main"], ["!=", "type", "trunk"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "butt",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@main-case-width",
+      "line-color": "@road-case-dark",
+      "line-gap-width": "@main-width",
+      "line-translate": [0, 0]
+    }
+  }, {
+    "id": "bridge-motorway-trunk-case",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "bridge",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["any", ["in", "class", "motorway"], ["==", "type", "trunk"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "butt",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@road-case-width-lg",
+      "line-color": "@road-motorway-case",
+      "line-gap-width": "@motorway-width"
+    }
+  }, {
+    "id": "bridge-motorway_link",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "bridge",
+    "minzoom": 10,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "motorway_link"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@motorway_link-width",
+      "line-color": "@road-motorway"
+    }
+  }, {
+    "id": "bridge-service-driveway",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "bridge",
+    "minzoom": 15,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "service", "driveway"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@road-width-minor",
+      "line-color": "@road-minor"
+    }
+  }, {
+    "id": "bridge-construction",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "bridge",
+    "minzoom": 14,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "street_limited"], ["==", "$type", "LineString"], ["==", "type", "construction"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "butt",
+      "line-join": "miter"
+    },
+    "paint": {
+      "line-width": "@street_limited-width",
+      "line-color": "@road-case-dark",
+      "line-opacity": "@street-high-opacity",
+      "line-dasharray": {
+        "base": 1,
+        "stops": [[14, [0.4, 0.8]], [15, [0.3, 0.6]], [16, [0.2, 0.3]], [17, [0.2, 0.25]], [18, [0.15, 0.15]]]
+      }
+    }
+  }, {
+    "id": "bridge-street_limited",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "bridge",
+    "minzoom": 11,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "street_limited"], ["==", "$type", "LineString"], ["!=", "type", "construction"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@street_limited-width",
+      "line-color": "@road-street-limited",
+      "line-opacity": "@street-high-opacity"
+    }
+  }, {
+    "id": "bridge-street",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "bridge",
+    "minzoom": 11,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "street"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@street-width",
+      "line-color": "@road-minor",
+      "line-opacity": "@street-high-opacity"
+    }
+  }, {
+    "id": "bridge-main",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "bridge",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "main"], ["!=", "type", "trunk"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@main-width",
+      "line-color": "@road-minor",
+      "line-opacity": "@road-high-z-fadein"
+    }
+  }, {
+    "id": "bridge-trunk",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "bridge",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "main"], ["==", "type", "trunk"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@motorway-width",
+      "line-color": "@road-trunk"
+    }
+  }, {
+    "id": "bridge-motorway",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "bridge",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "motorway"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-width": "@motorway-width",
+      "line-color": "@road-motorway"
+    }
+  }, {
+    "id": "bridge-oneway-arrows-white",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "bridge",
+    "minzoom": 15,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "oneway", 1], ["any", ["in", "class", "motorway", "motorway_link"], ["in", "type", "trunk"]]],
+    "layout": {
+      "symbol-min-distance": 250,
+      "symbol-placement": "line",
+      "icon-image": {
+        "base": 1,
+        "stops": [[16, "oneway-spaced-white-small"], [17, "oneway-spaced-white-large"]]
+      },
+      "icon-ignore-placement": true
+    },
+    "paint": {}
+  }, {
+    "id": "bridge-oneway-arrows-color",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "bridge",
+    "minzoom": 15,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "oneway", 1], ["in", "class", "main", "street", "street_limited"], ["!=", "type", "trunk"]],
+    "layout": {
+      "symbol-min-distance": 250,
+      "symbol-placement": "line",
+      "icon-image": {
+        "base": 1,
+        "stops": [[16, "oneway-spaced-small"], [17, "oneway-spaced-large"]]
+      },
+      "icon-ignore-placement": true
+    },
+    "paint": {}
+  }, {
+    "id": "bridge-rail",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "bridge",
+    "minzoom": 13,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "major_rail", "minor_rail"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "butt"
+    },
+    "paint": {
+      "line-color": "@rail-lowhigh",
+      "line-width": "@rail-width"
+    }
+  }, {
+    "id": "bridge-rail-tracks",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "bridge",
+    "minzoom": 13,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "major_rail", "minor_rail"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "butt"
+    },
+    "paint": {
+      "line-color": "@rail-lowhigh",
+      "line-width": "@rail-track-width",
+      "line-dasharray": [0.1, 15],
+      "line-opacity": {
+        "base": 1,
+        "stops": [[13.75, 0], [20, 1]]
+      }
+    }
+  }, {
+    "id": "bridge-aerialway",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "bridge",
+    "minzoom": 13,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "aerialway"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "butt"
+    },
+    "paint": {
+      "line-color": "@rail",
+      "line-width": "@rail-width"
+    }
+  }, {
+    "id": "hedges",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "barrier_line",
+    "minzoom": 16,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "hedge"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-color": "#e2f4c2",
+      "line-width": {
+        "base": 1,
+        "stops": [[16, 1], [20, 3]]
+      },
+      "line-opacity": 1,
+      "line-dasharray": [1, 2, 5, 2, 1, 2]
+    }
+  }, {
+    "id": "fences",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "barrier_line",
+    "minzoom": 16,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "fence"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-color": "@building-shadow",
+      "line-width": {
+        "base": 1,
+        "stops": [[16, 1], [20, 3]]
+      },
+      "line-opacity": 1,
+      "line-dasharray": [1, 2, 5, 2, 1, 2]
+    }
+  }, {
+    "id": "gates",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "barrier_line",
+    "minzoom": 17,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "gate"]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "round",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-color": "@building-shadow",
+      "line-width": {
+        "base": 1,
+        "stops": [[16, 1], [20, 3]]
+      },
+      "line-opacity": 0.5,
+      "line-dasharray": [1, 2, 5, 2, 1, 2]
+    }
+  }, {
+    "id": "admin-2-boundaries-bg",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "admin",
+    "minzoom": 1,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "admin_level", 2], ["==", "maritime", 0]],
+    "layout": {
+      "visibility": "visible",
+      "line-join": "miter",
+      "line-cap": "butt"
+    },
+    "paint": {
+      "line-width": {
+        "base": 1,
+        "stops": [[3, 3.5], [10, 10]]
+      },
+      "line-color": {
+        "base": 1,
+        "stops": [[6, "@land"], [8, "#f6e8e1"]]
+      },
+      "line-opacity": {
+        "base": 1,
+        "stops": [[3, 0], [4, 0.5]]
+      },
+      "line-translate": [0, 0],
+      "line-blur": {
+        "base": 1,
+        "stops": [[3, 0], [10, 2]]
+      }
+    }
+  }, {
+    "id": "admin-3-4-boundaries",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "admin",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", [">=", "admin_level", 3], ["==", "maritime", 0]],
+    "layout": {
+      "visibility": "visible",
+      "line-join": "round",
+      "line-cap": "round"
+    },
+    "paint": {
+      "line-dasharray": {
+        "base": 1,
+        "stops": [[6, [2, 0]], [7, [2, 2, 6, 2]]]
+      },
+      "line-width": {
+        "base": 1,
+        "stops": [[7, 0.75], [12, 1.5]]
+      },
+      "line-opacity": {
+        "base": 1,
+        "stops": [[2, 0], [3, 1]]
+      },
+      "line-color": {
+        "base": 1,
+        "stops": [[3, "#c3bfcc"], [7, "#aba8b3"]]
+      }
+    }
+  }, {
+    "id": "admin-2-boundaries",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "admin",
+    "minzoom": 1,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "admin_level", 2], ["==", "maritime", 0], ["==", "disputed", 0]],
+    "layout": {
+      "visibility": "visible",
+      "line-join": "round",
+      "line-cap": "round"
+    },
+    "paint": {
+      "line-color": "@admin",
+      "line-width": "@admin-2-boundary"
+    }
+  }, {
+    "id": "admin-2-boundaries-dispute",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "admin",
+    "minzoom": 1,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "admin_level", 2], ["==", "maritime", 0], ["==", "disputed", 1]],
+    "layout": {
+      "visibility": "visible",
+      "line-cap": "butt",
+      "line-join": "round"
+    },
+    "paint": {
+      "line-dasharray": [1.5, 1.5],
+      "line-color": "@admin",
+      "line-width": "@admin-2-boundary"
+    }
+  }, {
+    "id": "contour",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-terrain-v2",
+    "source-layer": "contour",
+    "minzoom": 14,
+    "maxzoom": 22,
+    "filter": ["all", ["!=", "index", 5]],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "line-opacity": 0.07,
+      "line-color": "#66601a"
+    }
+  }, {
+    "id": "contour-index",
+    "type": "line",
+    "source": "mapbox://mapbox.mapbox-terrain-v2",
+    "source-layer": "contour",
+    "minzoom": 14,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "index", 5]],
+    "layout": {
+      "visibility": "visible"
+    },
+    "paint": {
+      "line-opacity": 0.12,
+      "line-color": "#66601a"
+    }
+  }, {
+    "id": "country-label-lg",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "country_label",
+    "minzoom": 1,
+    "maxzoom": 7,
+    "filter": ["all", ["in", "scalerank", 1, 2]],
+    "layout": {
+      "text-field": "{name_en}",
+      "visibility": "visible",
+      "text-max-size": 24,
+      "text-max-width": {
+        "base": 1,
+        "stops": [[0, 5], [3, 6]]
+      },
+      "text-font": "DIN Offc Pro Medium, Arial Unicode MS Bold"
+    },
+    "paint": {
+      "text-size": {
+        "base": 1,
+        "stops": [[1, 10], [6, 24]]
+      },
+      "text-color": "@label-primary",
+      "text-halo-color": {
+        "base": 1,
+        "stops": [[2, "@country-halo"], [3, "@halo"]]
+      },
+      "text-halo-width": 1.25
+    }
+  }, {
+    "id": "country-label-md",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "country_label",
+    "minzoom": 1,
+    "maxzoom": 8,
+    "filter": ["all", ["in", "scalerank", 3, 4]],
+    "layout": {
+      "text-field": {
+        "base": 1,
+        "stops": [[0, "{code}"], [2, "{name_en}"]]
+      },
+      "visibility": "visible",
+      "text-max-size": 24,
+      "text-max-width": 6,
+      "text-font": "DIN Offc Pro Medium, Arial Unicode MS Regular"
+    },
+    "paint": {
+      "text-size": {
+        "base": 1,
+        "stops": [[3, 10], [8, 24]]
+      },
+      "text-color": "@label-primary",
+      "text-halo-color": {
+        "base": 1,
+        "stops": [[2, "@country-halo"], [3, "@halo"]]
+      },
+      "text-halo-width": 1.25
+    }
+  }, {
+    "id": "country-label-sm",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "country_label",
+    "minzoom": 1,
+    "maxzoom": 10,
+    "filter": ["all", [">=", "scalerank", 5]],
+    "layout": {
+      "text-field": "{name_en}",
+      "visibility": "visible",
+      "text-max-size": 22,
+      "text-max-width": 6,
+      "text-font": "DIN Offc Pro Medium, Arial Unicode MS Regular"
+    },
+    "paint": {
+      "text-size": {
+        "base": 0.9,
+        "stops": [[5, 14], [9, 22]]
+      },
+      "text-color": "@label-primary",
+      "text-halo-color": {
+        "base": 1,
+        "stops": [[2, "@country-halo"], [3, "@halo"]]
+      },
+      "text-halo-width": 1.25
+    }
+  }, {
+    "id": "state-label-lg",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "state_label",
+    "minzoom": 3,
+    "maxzoom": 7,
+    "filter": ["all", [">=", "area", 80000]],
+    "layout": {
+      "text-allow-overlap": false,
+      "text-ignore-placement": false,
+      "text-max-size": {
+        "base": 1,
+        "stops": [[4, 10], [7, 18]]
+      },
+      "text-transform": "uppercase",
+      "text-font": "DIN Offc Pro Bold, Arial Unicode MS Regular",
+      "text-padding": 1,
+      "visibility": "visible",
+      "text-field": {
+        "base": 1,
+        "stops": [[0, "{abbr}"], [4, "{name_en}"]]
+      },
+      "text-letter-spacing": 0.15,
+      "text-max-width": 6
+    },
+    "paint": {
+      "text-size": {
+        "base": 1,
+        "stops": [[4, 10], [7, 18]]
+      },
+      "text-opacity": 1,
+      "text-color": "@label-state",
+      "text-halo-color": "@halo",
+      "text-halo-width": 1
+    }
+  }, {
+    "id": "state-label-md",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "state_label",
+    "minzoom": 3,
+    "maxzoom": 8,
+    "filter": ["all", ["<", "area", 80000], [">=", "area", 20000]],
+    "layout": {
+      "text-allow-overlap": false,
+      "text-ignore-placement": false,
+      "text-max-size": {
+        "base": 1,
+        "stops": [[5, 10], [8, 16]]
+      },
+      "text-transform": "uppercase",
+      "text-font": "DIN Offc Pro Bold, Arial Unicode MS Regular",
+      "visibility": "visible",
+      "text-field": {
+        "base": 1,
+        "stops": [[0, "{abbr}"], [5, "{name_en}"]]
+      },
+      "text-letter-spacing": 0.15,
+      "text-max-width": 6
+    },
+    "paint": {
+      "text-size": {
+        "base": 1,
+        "stops": [[5, 10], [8, 16]]
+      },
+      "text-opacity": 1,
+      "text-color": "@label-state",
+      "text-halo-color": "@halo",
+      "text-halo-width": 1
+    }
+  }, {
+    "id": "state-label-sm",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "state_label",
+    "minzoom": 3,
+    "maxzoom": 9,
+    "filter": ["all", ["<", "area", 20000]],
+    "layout": {
+      "text-allow-overlap": false,
+      "text-ignore-placement": false,
+      "text-max-size": {
+        "base": 1,
+        "stops": [[6, 10], [9, 14]]
+      },
+      "text-transform": "uppercase",
+      "text-font": "DIN Offc Pro Bold, Arial Unicode MS Regular",
+      "visibility": "visible",
+      "text-field": {
+        "base": 1,
+        "stops": [[0, "{abbr}"], [6, "{name_en}"]]
+      },
+      "text-letter-spacing": 0.15,
+      "text-max-width": 5
+    },
+    "paint": {
+      "text-size": {
+        "base": 1,
+        "stops": [[6, 10], [9, 14]]
+      },
+      "text-opacity": 1,
+      "text-color": "@label-state",
+      "text-halo-color": "@halo",
+      "text-halo-width": 1
+    }
+  }, {
+    "id": "marine-label-lg-pt",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "marine_label",
+    "minzoom": 1,
+    "maxzoom": 4,
+    "filter": ["all", ["in", "labelrank", 1], ["==", "$type", "Point"]],
+    "layout": {
+      "visibility": "visible",
+      "text-field": "{name_en}",
+      "text-max-width": 4,
+      "text-letter-spacing": 0.25,
+      "text-line-height": 1.5,
+      "text-max-size": {
+        "base": 1,
+        "stops": [[1, 14], [4, 30]]
+      },
+      "text-font": "DIN Offc Pro Italic, Arial Unicode MS Regular"
+    },
+    "paint": {
+      "text-color": "@label-water",
+      "text-size": {
+        "base": 1,
+        "stops": [[1, 14], [4, 30]]
+      }
+    }
+  }, {
+    "id": "marine-label-lg-ln",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "marine_label",
+    "minzoom": 1,
+    "maxzoom": 4,
+    "filter": ["all", ["in", "labelrank", 1], ["==", "$type", "LineString"]],
+    "layout": {
+      "visibility": "visible",
+      "text-field": "{name_en}",
+      "text-max-width": 4,
+      "text-letter-spacing": 0.25,
+      "text-line-height": 1.1,
+      "text-max-size": {
+        "base": 1,
+        "stops": [[1, 14], [4, 30]]
+      },
+      "symbol-placement": "line",
+      "text-font": "DIN Offc Pro Italic, Arial Unicode MS Regular"
+    },
+    "paint": {
+      "text-color": "@label-water",
+      "text-size": {
+        "base": 1,
+        "stops": [[1, 14], [4, 30]]
+      }
+    }
+  }, {
+    "id": "marine-label-md-pt",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "marine_label",
+    "minzoom": 2,
+    "maxzoom": 8,
+    "filter": ["all", ["in", "labelrank", 2, 3], ["==", "$type", "Point"]],
+    "layout": {
+      "visibility": "visible",
+      "text-field": "{name_en}",
+      "text-max-width": 5,
+      "text-letter-spacing": 0.15,
+      "text-line-height": 1.5,
+      "text-max-size": {
+        "base": 1.1,
+        "stops": [[2, 14], [5, 20]]
+      },
+      "text-font": "DIN Offc Pro Italic, Arial Unicode MS Regular"
+    },
+    "paint": {
+      "text-color": "@label-water",
+      "text-size": {
+        "base": 1.1,
+        "stops": [[2, 14], [5, 20]]
+      }
+    }
+  }, {
+    "id": "marine-label-md-ln",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "marine_label",
+    "minzoom": 2,
+    "maxzoom": 8,
+    "filter": ["all", ["in", "labelrank", 2, 3], ["==", "$type", "LineString"]],
+    "layout": {
+      "text-line-height": 1.1,
+      "symbol-min-distance": 250,
+      "text-max-size": 20,
+      "text-font": "DIN Offc Pro Italic, Arial Unicode MS Regular",
+      "symbol-placement": "line",
+      "visibility": "visible",
+      "text-field": "{name_en}",
+      "text-letter-spacing": 0.15,
+      "text-max-width": 5
+    },
+    "paint": {
+      "text-color": "@label-water",
+      "text-size": {
+        "base": 1.1,
+        "stops": [[2, 12], [5, 20]]
+      }
+    }
+  }, {
+    "id": "marine-label-sm-pt",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "marine_label",
+    "minzoom": 3,
+    "maxzoom": 10,
+    "filter": ["all", [">=", "labelrank", 4], ["==", "$type", "Point"]],
+    "layout": {
+      "visibility": "visible",
+      "text-field": "{name_en}",
+      "text-max-width": 5,
+      "text-letter-spacing": 0.1,
+      "text-line-height": 1.5,
+      "text-max-size": 20,
+      "symbol-placement": "point",
+      "text-font": "DIN Offc Pro Italic, Arial Unicode MS Regular"
+    },
+    "paint": {
+      "text-color": "@label-water",
+      "text-size": {
+        "base": 1,
+        "stops": [[3, 12], [6, 16]]
+      }
+    }
+  }, {
+    "id": "marine-label-sm-ln",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "marine_label",
+    "minzoom": 3,
+    "maxzoom": 10,
+    "filter": ["all", [">=", "labelrank", 4], ["==", "$type", "LineString"]],
+    "layout": {
+      "text-line-height": 1.1,
+      "symbol-min-distance": {
+        "base": 1,
+        "stops": [[4, 100], [6, 400]]
+      },
+      "text-max-size": 16,
+      "text-font": "DIN Offc Pro Italic, Arial Unicode MS Regular",
+      "symbol-placement": "line",
+      "visibility": "visible",
+      "text-field": "{name_en}",
+      "text-letter-spacing": 0.1,
+      "text-max-width": 5
+    },
+    "paint": {
+      "text-color": "@label-water",
+      "text-size": {
+        "base": 1,
+        "stops": [[3, 12], [6, 16]]
+      }
+    }
+  }, {
+    "id": "place-city-lg-n",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "place_label",
+    "minzoom": 1,
+    "maxzoom": 14,
+    "filter": ["all", ["<=", "scalerank", 2], ["==", "type", "city"], ["in", "ldir", "N", "NE", "NW", "W"]],
+    "layout": {
+      "icon-image": "circle.sdf",
+      "text-max-size": "@label-city-lg-size",
+      "text-font": {
+        "base": 1,
+        "stops": [[7, "DIN Offc Pro Regular, Arial Unicode MS Regular"], [8, "DIN Offc Pro Medium, Arial Unicode MS Bold"]]
+      },
+      "visibility": "visible",
+      "text-offset": {
+        "base": 1,
+        "stops": [[7.99, [0, -0.25]], [8, [0, 0]]]
+      },
+      "text-anchor": {
+        "base": 1,
+        "stops": [[7, "bottom"], [8, "center"]]
+      },
+      "text-field": "{name_en}",
+      "text-max-width": 7,
+      "icon-max-size": 0.4
+    },
+    "paint": {
+      "text-size": "@label-city-lg-size",
+      "text-color": "@label-primary",
+      "icon-halo-blur": 1,
+      "icon-halo-color": "@halo",
+      "icon-halo-width": 1,
+      "text-opacity": 1,
+      "icon-color": "@label-primary",
+      "text-halo-color": "@halo",
+      "icon-size": 0.4,
+      "text-halo-width": 1,
+      "icon-opacity": {
+        "base": 1,
+        "stops": [[7.99, 1], [8, 0]]
+      },
+      "text-halo-blur": 1
+    }
+  }, {
+    "id": "place-city-lg-s",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "place_label",
+    "minzoom": 1,
+    "maxzoom": 14,
+    "filter": ["all", ["<=", "scalerank", 2], ["==", "type", "city"], ["in", "ldir", "S", "SE", "SW", "E"]],
+    "layout": {
+      "icon-image": "circle.sdf",
+      "text-max-size": "@label-city-lg-size",
+      "text-font": {
+        "base": 1,
+        "stops": [[7, "DIN Offc Pro Regular, Arial Unicode MS Regular"], [8, "DIN Offc Pro Medium, Arial Unicode MS Bold"]]
+      },
+      "visibility": "visible",
+      "text-offset": {
+        "base": 1,
+        "stops": [[7.99, [0, 0.15]], [8, [0, 0]]]
+      },
+      "text-anchor": {
+        "base": 1,
+        "stops": [[7, "top"], [8, "center"]]
+      },
+      "text-field": "{name_en}",
+      "text-max-width": 7,
+      "icon-max-size": 0.4
+    },
+    "paint": {
+      "text-size": "@label-city-lg-size",
+      "text-color": "@label-primary",
+      "icon-halo-blur": 1,
+      "icon-halo-color": "@halo",
+      "icon-halo-width": 1,
+      "icon-color": "@label-primary",
+      "text-halo-color": "@halo",
+      "icon-size": 0.4,
+      "text-halo-width": 1,
+      "icon-opacity": {
+        "base": 1,
+        "stops": [[7.99, 1], [8, 0]]
+      },
+      "text-halo-blur": 1
+    }
+  }, {
+    "id": "place-city-md-n",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "place_label",
+    "minzoom": 0,
+    "maxzoom": 14,
+    "filter": ["all", ["in", "scalerank", 3, 4, 5], ["==", "type", "city"], ["in", "ldir", "N", "NE", "NW", "W"]],
+    "layout": {
+      "icon-image": "circle.sdf",
+      "text-max-size": "@label-city-md-size",
+      "text-font": {
+        "base": 1,
+        "stops": [[7, "DIN Offc Pro Regular, Arial Unicode MS Regular"], [8, "DIN Offc Pro Medium, Arial Unicode MS Bold"]]
+      },
+      "visibility": "visible",
+      "text-offset": {
+        "base": 1,
+        "stops": [[7.99, [0, -0.25]], [8, [0, 0]]]
+      },
+      "text-anchor": {
+        "base": 1,
+        "stops": [[7, "bottom"], [8, "center"]]
+      },
+      "text-field": "{name_en}",
+      "text-max-width": 7,
+      "icon-max-size": 0.35
+    },
+    "paint": {
+      "text-size": "@label-city-md-size",
+      "text-color": "@label-primary",
+      "icon-halo-blur": 1,
+      "icon-halo-color": "@halo",
+      "icon-halo-width": 1,
+      "icon-color": "@label-primary",
+      "text-halo-color": "@halo",
+      "icon-size": 0.35,
+      "text-halo-width": 1,
+      "icon-opacity": {
+        "base": 1,
+        "stops": [[7.99, 1], [8, 0]]
+      },
+      "text-halo-blur": 1
+    }
+  }, {
+    "id": "place-city-md-s",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "place_label",
+    "minzoom": 0,
+    "maxzoom": 14,
+    "filter": ["all", ["in", "scalerank", 3, 4, 5], ["==", "type", "city"], ["in", "ldir", "S", "SE", "WW", "E"]],
+    "layout": {
+      "visibility": "visible",
+      "text-field": "{name_en}",
+      "icon-image": "circle.sdf",
+      "text-anchor": {
+        "base": 1,
+        "stops": [[7, "top"], [8, "center"]]
+      },
+      "text-offset": {
+        "base": 1,
+        "stops": [[7.99, [0, 0.1]], [8, [0, 0]]]
+      },
+      "icon-max-size": 0.35,
+      "text-max-size": "@label-city-md-size",
+      "text-font": {
+        "base": 1,
+        "stops": [[7, "DIN Offc Pro Regular, Arial Unicode MS Regular"], [8, "DIN Offc Pro Medium, Arial Unicode MS Bold"]]
+      }
+    },
+    "paint": {
+      "icon-size": 0.35,
+      "text-size": "@label-city-md-size",
+      "text-halo-width": 1,
+      "text-halo-color": "@halo",
+      "text-color": "@label-primary",
+      "text-halo-blur": 1,
+      "icon-color": "@label-primary",
+      "icon-opacity": {
+        "base": 1,
+        "stops": [[7.99, 1], [8, 0]]
+      }
+    }
+  }, {
+    "id": "place-city-sm",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "place_label",
+    "minzoom": 0,
+    "maxzoom": 14,
+    "filter": ["all", ["!in", "scalerank", 0, 1, 2, 3, 4, 5], ["==", "type", "city"]],
+    "layout": {
+      "icon-image": "circle.sdf",
+      "text-max-size": {
+        "base": 1,
+        "stops": [[6, 12], [14, 22]]
+      },
+      "text-transform": "none",
+      "text-font": {
+        "base": 1,
+        "stops": [[7, "DIN Offc Pro Regular, Arial Unicode MS Regular"], [8, "DIN Offc Pro Medium, Arial Unicode MS Bold"]]
+      },
+      "visibility": "visible",
+      "text-offset": {
+        "base": 1,
+        "stops": [[7.99, [0, -0.2]], [8, [0, 0]]]
+      },
+      "text-anchor": {
+        "base": 1,
+        "stops": [[7, "bottom"], [8, "center"]]
+      },
+      "text-field": "{name_en}",
+      "text-max-width": 7,
+      "icon-max-size": 0.3
+    },
+    "paint": {
+      "text-size": {
+        "base": 1,
+        "stops": [[6, 12], [14, 22]]
+      },
+      "text-color": "@label-primary",
+      "icon-halo-blur": 1,
+      "icon-halo-color": "@halo",
+      "icon-halo-width": 1,
+      "icon-color": "@label-primary",
+      "text-halo-color": "@halo",
+      "icon-size": 0.3,
+      "text-halo-width": 1.25,
+      "icon-opacity": {
+        "base": 1,
+        "stops": [[7.99, 1], [8, 0]]
+      }
+    }
+  }, {
+    "id": "poi-islands",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "poi_label",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "type", "Island"]],
+    "layout": {
+      "text-line-height": 1.2,
+      "text-allow-overlap": false,
+      "symbol-min-distance": 250,
+      "text-ignore-placement": false,
+      "text-max-angle": 38,
+      "text-max-size": 14,
+      "text-font": "DIN Offc Pro Regular, Arial Unicode MS Regular",
+      "symbol-placement": "point",
+      "text-padding": 2,
+      "visibility": "visible",
+      "text-offset": [0, 0],
+      "icon-optional": false,
+      "text-rotation-alignment": "viewport",
+      "text-anchor": "center",
+      "text-field": "{name_en}",
+      "text-letter-spacing": 0.02,
+      "text-max-width": 7
+    },
+    "paint": {
+      "text-color": "@label-poi",
+      "text-halo-color": "@halo",
+      "text-halo-width": 1,
+      "text-size": {
+        "base": 1,
+        "stops": [[10, 11], [18, 16]]
+      }
+    }
+  }, {
+    "id": "place-town",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "place_label",
+    "minzoom": 6,
+    "maxzoom": 14,
+    "filter": ["all", ["in", "type", "town"]],
+    "layout": {
+      "icon-image": "circle.sdf",
+      "text-max-size": {
+        "base": 1,
+        "stops": [[7, 11.5], [15, 20]]
+      },
+      "text-font": {
+        "base": 1,
+        "stops": [[11, "DIN Offc Pro Regular, Arial Unicode MS Regular"], [12, "DIN Offc Pro Medium, Arial Unicode MS Bold"]]
+      },
+      "visibility": "visible",
+      "text-offset": {
+        "base": 1,
+        "stops": [[7, [0, -0.15]], [8, [0, 0]]]
+      },
+      "text-anchor": {
+        "base": 1,
+        "stops": [[7, "bottom"], [8, "center"]]
+      },
+      "text-field": "{name_en}",
+      "text-max-width": 7,
+      "icon-max-size": 0.3
+    },
+    "paint": {
+      "text-size": {
+        "base": 1,
+        "stops": [[7, 11.5], [15, 20]]
+      },
+      "text-color": "@label-primary",
+      "icon-halo-blur": 1,
+      "icon-halo-color": "@halo",
+      "icon-halo-width": 1,
+      "icon-color": "@label-primary",
+      "text-halo-color": "@halo",
+      "icon-size": 0.3,
+      "text-halo-width": 1.25,
+      "icon-opacity": {
+        "base": 1,
+        "stops": [[7.99, 1], [8, 0]]
+      }
+    }
+  }, {
+    "id": "place-village",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "place_label",
+    "minzoom": 8,
+    "maxzoom": 15,
+    "filter": ["all", ["in", "type", "village"]],
+    "layout": {
+      "visibility": "visible",
+      "text-field": "{name_en}",
+      "text-max-size": {
+        "base": 1,
+        "stops": [[10, 11.5], [16, 18]]
+      },
+      "text-font": "DIN Offc Pro Regular, Arial Unicode MS Regular",
+      "text-max-width": 7
+    },
+    "paint": {
+      "text-size": {
+        "base": 1,
+        "stops": [[10, 11.5], [16, 18]]
+      },
+      "text-halo-color": "@halo",
+      "text-halo-width": 1.25,
+      "text-color": "@label-primary"
+    }
+  }, {
+    "id": "place-hamlet",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "place_label",
+    "minzoom": 10,
+    "maxzoom": 16,
+    "filter": ["all", ["in", "type", "hamlet"]],
+    "layout": {
+      "visibility": "visible",
+      "text-field": "{name_en}",
+      "text-max-size": {
+        "base": 1,
+        "stops": [[12, 11.5], [15, 16]]
+      },
+      "text-font": "DIN Offc Pro Regular, Arial Unicode MS Regular"
+    },
+    "paint": {
+      "text-size": {
+        "base": 1,
+        "stops": [[12, 11.5], [15, 16]]
+      },
+      "text-halo-color": "@halo",
+      "text-halo-width": 1.25,
+      "text-color": "@label-primary"
+    }
+  }, {
+    "id": "place-suburb",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "place_label",
+    "minzoom": 10,
+    "maxzoom": 16,
+    "filter": ["all", ["==", "type", "suburb"]],
+    "layout": {
+      "visibility": "visible",
+      "text-field": "{name_en}",
+      "text-transform": "uppercase",
+      "text-max-size": {
+        "base": 1,
+        "stops": [[11, 11], [15, 18]]
+      },
+      "text-font": "DIN Offc Pro Regular, Arial Unicode MS Regular",
+      "text-letter-spacing": 0.15,
+      "text-max-width": 7,
+      "text-padding": 3
+    },
+    "paint": {
+      "text-size": {
+        "base": 1,
+        "stops": [[11, 11], [15, 18]]
+      },
+      "text-halo-color": "rgba(255,255,255, 0.5)",
+      "text-halo-width": 1.75,
+      "text-color": "@label-neighbourhood"
+    }
+  }, {
+    "id": "place-neighbourhood",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "place_label",
+    "minzoom": 10,
+    "maxzoom": 16,
+    "filter": ["all", ["in", "type", "neighbourhood"]],
+    "layout": {
+      "visibility": "visible",
+      "text-field": "{name_en}",
+      "text-max-size": {
+        "base": 1,
+        "stops": [[12, 11], [16, 16]]
+      },
+      "text-transform": "uppercase",
+      "text-letter-spacing": 0.1,
+      "text-max-width": 7,
+      "text-font": "DIN Offc Pro Regular, Arial Unicode MS Regular",
+      "text-padding": 3
+    },
+    "paint": {
+      "text-size": {
+        "base": 1,
+        "stops": [[12, 11], [16, 16]]
+      },
+      "text-halo-color": "rgba(255,255,255, 0.5)",
+      "text-halo-width": 1.75,
+      "text-color": "@label-neighbourhood",
+      "text-halo-blur": 0
+    }
+  }, {
+    "id": "poi-islets",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "poi_label",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "type", "Islet"]],
+    "layout": {
+      "text-line-height": 1.2,
+      "text-allow-overlap": false,
+      "symbol-min-distance": 250,
+      "text-ignore-placement": false,
+      "text-max-angle": 38,
+      "text-max-size": {
+        "base": 1,
+        "stops": [[10, 11], [14, 16]]
+      },
+      "text-font": "DIN Offc Pro Regular, Arial Unicode MS Regular",
+      "symbol-placement": "point",
+      "text-padding": 2,
+      "visibility": "visible",
+      "text-offset": [0, 0],
+      "icon-optional": false,
+      "text-rotation-alignment": "viewport",
+      "text-anchor": "center",
+      "text-field": "{name_en}",
+      "text-letter-spacing": 0.02,
+      "text-max-width": 8
+    },
+    "paint": {
+      "text-color": "@label-poi",
+      "text-halo-color": "@halo",
+      "text-halo-width": 1,
+      "text-size": {
+        "base": 1,
+        "stops": [[10, 11], [14, 16]]
+      }
+    }
+  }, {
+    "id": "water-label",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "water_label",
+    "minzoom": 5,
+    "maxzoom": 22,
+    "filter": ["all"],
+    "layout": {
+      "text-field": "{name_en}",
+      "visibility": "visible",
+      "text-font": "DIN Offc Pro Italic, Arial Unicode MS Regular",
+      "text-max-width": 7,
+      "text-max-size": {
+        "base": 1,
+        "stops": [[13, 13], [18, 18]]
+      }
+    },
+    "paint": {
+      "text-halo-width": 0,
+      "text-size": {
+        "base": 1,
+        "stops": [[13, 13], [18, 18]]
+      },
+      "text-halo-color": "@halo",
+      "text-color": "@label-water-dark",
+      "text-halo-blur": 1.5
+    }
+  }, {
+    "id": "airport-label",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "poi_label",
+    "minzoom": 9,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "maki", "airport", "heliport", "rocket"], ["<=", "scalerank", 2]],
+    "layout": {
+      "text-allow-overlap": false,
+      "symbol-min-distance": 250,
+      "icon-image": {
+        "stops": [[12, "{maki}-11"], [13, "{maki}-15"]]
+      },
+      "text-ignore-placement": false,
+      "text-max-size": {
+        "base": 1,
+        "stops": [[10, 12], [18, 18]]
+      },
+      "text-font": "DIN Offc Pro Regular, Arial Unicode MS Regular",
+      "symbol-placement": "point",
+      "text-padding": 2,
+      "visibility": "visible",
+      "text-offset": {
+        "base": 1,
+        "stops": [[12, [0, 1]], [13, [0, 1.25]]]
+      },
+      "icon-optional": false,
+      "text-rotation-alignment": "viewport",
+      "text-anchor": "top",
+      "text-field": {
+        "stops": [[12, "{ref}"], [13, "{name_en}"]]
+      },
+      "text-letter-spacing": 0.02,
+      "text-max-width": 9
+    },
+    "paint": {
+      "text-color": "@label-transit",
+      "text-halo-color": "@halo",
+      "text-halo-width": 1.25,
+      "text-size": {
+        "base": 1,
+        "stops": [[10, 12], [18, 18]]
+      }
+    }
+  }, {
+    "id": "poi-scalerank1",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "poi_label",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["!in", "maki", "rail-light", "rail-metro", "rail", "airport", "airfield", "heliport", "rocket", "park", "golf", "cemetery", "zoo", "campsite", "swimming", "dog-park"], ["<=", "scalerank", 1], ["!=", "type", "Island"]],
+    "layout": {
+      "text-line-height": 1.2,
+      "text-allow-overlap": false,
+      "symbol-min-distance": 250,
+      "icon-image": {
+        "stops": [[13, "{maki}-11"], [14, "{maki}-15"]]
+      },
+      "text-ignore-placement": false,
+      "text-max-angle": 38,
+      "text-max-size": "@poi-scalerank1",
+      "text-font": "DIN Offc Pro Medium, Arial Unicode MS Regular",
+      "symbol-placement": "point",
+      "text-padding": 2,
+      "visibility": "visible",
+      "text-offset": [0, 1],
+      "icon-optional": false,
+      "text-rotation-alignment": "viewport",
+      "text-anchor": "top",
+      "text-field": "{name_en}",
+      "text-letter-spacing": 0.02,
+      "text-max-width": 8
+    },
+    "paint": {
+      "text-color": "@label-poi",
+      "text-halo-color": "@halo",
+      "text-halo-width": 1,
+      "text-size": "@poi-scalerank1"
+    }
+  }, {
+    "id": "poi-parks-scalerank1",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "poi_label",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "maki", "park", "golf", "cemetery", "zoo", "campsite", "swimming", "dog-park"], ["<=", "scalerank", 1]],
+    "layout": {
+      "text-line-height": 1.2,
+      "text-allow-overlap": false,
+      "symbol-min-distance": 250,
+      "icon-image": {
+        "stops": [[13, "{maki}-11"], [14, "{maki}-15"]]
+      },
+      "text-ignore-placement": false,
+      "text-max-angle": 38,
+      "text-max-size": "@poi-scalerank1",
+      "text-font": "DIN Offc Pro Medium, Arial Unicode MS Regular",
+      "symbol-placement": "point",
+      "text-padding": 2,
+      "visibility": "visible",
+      "text-offset": [0, 1],
+      "icon-optional": false,
+      "text-rotation-alignment": "viewport",
+      "text-anchor": "top",
+      "text-field": "{name_en}",
+      "text-letter-spacing": 0.02,
+      "text-max-width": 8
+    },
+    "paint": {
+      "text-color": "@label-park",
+      "text-halo-color": "@halo",
+      "text-halo-width": 1,
+      "text-halo-blur": 0,
+      "text-size": "@poi-scalerank1"
+    }
+  }, {
+    "id": "rail-label",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "poi_label",
+    "minzoom": 12,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "type", "Rail Station"]],
+    "layout": {
+      "symbol-min-distance": 250,
+      "icon-image": "{network}-11",
+      "symbol-avoid-edges": true,
+      "text-max-size": {
+        "base": 1,
+        "stops": [[13, 6], [14, 11], [16, 11], [20, 13]]
+      },
+      "text-font": "DIN Offc Pro Medium, Arial Unicode MS Regular",
+      "icon-allow-overlap": false,
+      "symbol-placement": "point",
+      "text-justify": "center",
+      "visibility": "visible",
+      "text-offset": [0, 1],
+      "text-rotation-alignment": "viewport",
+      "text-anchor": "top",
+      "text-field": {
+        "base": 1,
+        "stops": [[0, ""], [13, "{name_en}"]]
+      },
+      "text-letter-spacing": 0.02,
+      "icon-padding": 0,
+      "text-max-width": 7
+    },
+    "paint": {
+      "text-color": "@label-poi",
+      "text-halo-color": "@halo",
+      "text-halo-width": 1.5,
+      "text-size": "@poi-scalerank3",
+      "icon-halo-width": 4,
+      "icon-halo-color": "#fff",
+      "text-opacity": {
+        "base": 1,
+        "stops": [[13.99, 0], [14, 1]]
+      }
+    }
+  }, {
+    "id": "poi-parks-scalerank2",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "poi_label",
+    "minzoom": 13,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "maki", "park", "golf", "cemetery", "zoo", "campsite", "swimming", "dog-park"], ["==", "scalerank", 2]],
+    "layout": {
+      "text-line-height": 1.2,
+      "text-allow-overlap": false,
+      "symbol-min-distance": 250,
+      "icon-image": {
+        "stops": [[14, "{maki}-11"], [15, "{maki}-15"]]
+      },
+      "text-ignore-placement": false,
+      "text-max-angle": 38,
+      "text-max-size": "@poi-scalerank2",
+      "text-font": "DIN Offc Pro Medium, Arial Unicode MS Regular",
+      "symbol-placement": "point",
+      "text-padding": 2,
+      "visibility": "visible",
+      "text-offset": [0, 1.25],
+      "icon-optional": false,
+      "text-rotation-alignment": "viewport",
+      "text-anchor": "top",
+      "text-field": "{name_en}",
+      "text-letter-spacing": 0.02,
+      "text-max-width": 8
+    },
+    "paint": {
+      "text-color": "@label-park",
+      "text-halo-color": "@halo",
+      "text-halo-width": 1.25,
+      "text-size": "@poi-scalerank2"
+    }
+  }, {
+    "id": "poi-scalerank2",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "poi_label",
+    "minzoom": 13,
+    "maxzoom": 22,
+    "filter": ["all", ["!in", "maki", "rail-light", "rail-metro", "rail", "airport", "airfield", "heliport", "rocket", "park", "golf", "cemetery", "zoo", "campsite", "swimming", "dog-park"], ["==", "scalerank", 2]],
+    "layout": {
+      "text-line-height": 1.2,
+      "text-allow-overlap": false,
+      "symbol-min-distance": 250,
+      "icon-image": {
+        "stops": [[14, "{maki}-11"], [15, "{maki}-15"]]
+      },
+      "text-ignore-placement": false,
+      "text-max-angle": 38,
+      "text-max-size": "@poi-scalerank2",
+      "text-font": "DIN Offc Pro Medium, Arial Unicode MS Regular",
+      "symbol-placement": "point",
+      "text-padding": 2,
+      "visibility": "visible",
+      "text-offset": [0, 1.25],
+      "icon-optional": false,
+      "text-rotation-alignment": "viewport",
+      "text-anchor": "top",
+      "text-field": "{name_en}",
+      "text-letter-spacing": 0.02,
+      "text-max-width": 8
+    },
+    "paint": {
+      "text-color": "@label-poi",
+      "text-halo-color": "@halo",
+      "text-halo-width": 1.25,
+      "text-size": "@poi-scalerank2"
+    }
+  }, {
+    "id": "interstate_motorway_shields",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road_label",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "shield", "us-interstate", "us-interstate-business", "us-interstate-duplex"], ["<=", "reflen", 6]],
+    "layout": {
+      "text-allow-overlap": false,
+      "symbol-min-distance": 1000,
+      "icon-image": {
+        "base": 1,
+        "stops": [[15, "{shield}-{reflen}-small"], [16, "{shield}-{reflen}-large"]]
+      },
+      "icon-rotation-alignment": "viewport",
+      "symbol-avoid-edges": false,
+      "text-ignore-placement": false,
+      "text-max-angle": 38,
+      "text-max-size": 11,
+      "text-font": "DIN Offc Pro Medium, Arial Unicode MS Regular",
+      "symbol-placement": {
+        "base": 1,
+        "stops": [[10, "point"], [11, "line"]]
+      },
+      "text-padding": 20,
+      "visibility": "visible",
+      "text-rotation-alignment": "viewport",
+      "text-field": "{ref}",
+      "text-letter-spacing": 0.05,
+      "icon-padding": 20
+    },
+    "paint": {
+      "text-size": {
+        "base": 1,
+        "stops": [[16, 9], [16.01, 11]]
+      },
+      "text-color": "#fff",
+      "icon-halo-color": "rgba(0, 0, 0, 1)",
+      "icon-halo-width": 1,
+      "text-opacity": 1,
+      "icon-color": "white",
+      "text-halo-color": "@halo",
+      "text-halo-width": 0
+    }
+  }, {
+    "id": "other-motorway-shields",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road_label",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["!in", "shield", "us-interstate", "us-interstate-business", "us-interstate-duplex"], ["<=", "reflen", 6]],
+    "layout": {
+      "text-allow-overlap": false,
+      "symbol-min-distance": 1000,
+      "icon-image": {
+        "base": 1,
+        "stops": [[15, "{shield}-{reflen}-small"], [16, "{shield}-{reflen}-large"]]
+      },
+      "icon-rotation-alignment": "viewport",
+      "symbol-avoid-edges": false,
+      "text-ignore-placement": false,
+      "text-max-angle": 38,
+      "text-max-size": 11,
+      "text-font": "DIN Offc Pro Bold, Arial Unicode MS Regular",
+      "symbol-placement": {
+        "base": 1,
+        "stops": [[10, "point"], [11, "line"]]
+      },
+      "text-padding": 20,
+      "visibility": "visible",
+      "text-rotation-alignment": "viewport",
+      "text-field": "{ref}",
+      "text-letter-spacing": 0.05,
+      "icon-padding": 20
+    },
+    "paint": {
+      "text-size": {
+        "base": 1,
+        "stops": [[16, 9], [16.01, 11]]
+      },
+      "text-color": "@label-road",
+      "icon-halo-color": "rgba(0, 0, 0, 1)",
+      "icon-halo-width": 1,
+      "text-opacity": 1,
+      "icon-color": "white",
+      "text-halo-color": "@halo",
+      "text-halo-width": 0
+    }
+  }, {
+    "id": "road-label-large",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road_label",
+    "minzoom": 0,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "main", "motorway"]],
+    "layout": {
+      "text-allow-overlap": false,
+      "symbol-min-distance": 500,
+      "text-ignore-placement": false,
+      "text-max-angle": 30,
+      "text-max-size": {
+        "base": 1,
+        "stops": [[9, 10], [20, 16]]
+      },
+      "text-font": "DIN Offc Pro Regular, Arial Unicode MS Regular",
+      "symbol-placement": "line",
+      "text-padding": 2,
+      "visibility": "visible",
+      "text-rotation-alignment": "map",
+      "text-field": "{name_en}",
+      "text-letter-spacing": 0.01
+    },
+    "paint": {
+      "text-color": "@label-road",
+      "text-halo-color": "rgba(255,255,255, 0.75)",
+      "text-halo-width": 1,
+      "text-size": {
+        "base": 1,
+        "stops": [[9, 10], [20, 16]]
+      },
+      "text-halo-blur": 1
+    }
+  }, {
+    "id": "road-label-medium",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road_label",
+    "minzoom": 11,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "class", "street", "street_limited"], ["==", "$type", "LineString"]],
+    "layout": {
+      "symbol-min-distance": 500,
+      "text-max-angle": 30,
+      "text-font": "DIN Offc Pro Regular, Arial Unicode MS Regular",
+      "symbol-placement": "line",
+      "text-padding": 2,
+      "visibility": "visible",
+      "text-rotation-alignment": "map",
+      "text-field": "{name_en}",
+      "text-letter-spacing": 0.01
+    },
+    "paint": {
+      "text-color": "@label-road",
+      "text-halo-color": "@halo",
+      "text-halo-width": 1,
+      "text-size": {
+        "base": 1,
+        "stops": [[11, 10], [20, 14]]
+      }
+    }
+  }, {
+    "id": "road-label-small",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "road_label",
+    "minzoom": 15,
+    "maxzoom": 22,
+    "filter": ["all", ["!in", "class", "motorway", "main", "street_limited", "street"], ["==", "$type", "LineString"]],
+    "layout": {
+      "symbol-min-distance": 500,
+      "text-ignore-placement": false,
+      "text-max-angle": 30,
+      "text-max-size": 12,
+      "text-font": "DIN Offc Pro Regular, Arial Unicode MS Regular",
+      "symbol-placement": "line",
+      "text-padding": 2,
+      "visibility": "visible",
+      "text-rotation-alignment": "map",
+      "text-field": "{name_en}",
+      "text-letter-spacing": 0.01
+    },
+    "paint": {
+      "text-color": "@label-road",
+      "text-halo-color": "@halo",
+      "text-halo-width": 1.25,
+      "text-size": {
+        "base": 1,
+        "stops": [[15, 10], [20, 13]]
+      },
+      "text-halo-blur": 1
+    }
+  }, {
+    "id": "poi-parks-scalerank3",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "poi_label",
+    "minzoom": 15,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "maki", "park", "cemetery", "golf", "zoo"], ["==", "scalerank", 3]],
+    "layout": {
+      "text-line-height": 1.2,
+      "text-allow-overlap": false,
+      "symbol-min-distance": 250,
+      "icon-image": "{maki}-11",
+      "text-ignore-placement": false,
+      "text-max-angle": 38,
+      "text-max-size": "@poi-scalerank3",
+      "text-font": "DIN Offc Pro Medium, Arial Unicode MS Regular",
+      "symbol-placement": "point",
+      "text-padding": 2,
+      "visibility": "visible",
+      "text-offset": [0, 1],
+      "icon-optional": false,
+      "text-rotation-alignment": "viewport",
+      "text-anchor": "top",
+      "text-field": "{name_en}",
+      "text-letter-spacing": 0.02,
+      "text-max-width": 8
+    },
+    "paint": {
+      "text-color": "@label-park",
+      "text-halo-color": "@halo",
+      "text-halo-width": 1,
+      "text-size": "@poi-scalerank3"
+    }
+  }, {
+    "id": "poi-scalerank3",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "poi_label",
+    "minzoom": 15,
+    "maxzoom": 22,
+    "filter": ["all", ["!in", "maki", "rail-light", "rail-metro", "rail", "airport", "airfield", "heliport", "rocket", "park", "golf", "cemetery", "zoo", "campsite", "swimming", "dog-park"], ["==", "scalerank", 3]],
+    "layout": {
+      "text-line-height": 1.2,
+      "text-allow-overlap": false,
+      "symbol-min-distance": 250,
+      "icon-image": "{maki}-11",
+      "text-ignore-placement": false,
+      "text-max-angle": 38,
+      "text-max-size": "@poi-scalerank3",
+      "text-font": "DIN Offc Pro Medium, Arial Unicode MS Regular",
+      "symbol-placement": "point",
+      "text-padding": 1,
+      "visibility": "visible",
+      "text-offset": [0, 1],
+      "icon-optional": false,
+      "text-rotation-alignment": "viewport",
+      "text-anchor": "top",
+      "text-field": "{name_en}",
+      "text-letter-spacing": 0.02,
+      "text-max-width": 8
+    },
+    "paint": {
+      "text-color": "@label-poi",
+      "text-halo-color": "@halo",
+      "text-halo-width": 1,
+      "text-size": "@poi-scalerank3"
+    }
+  }, {
+    "id": "poi-parks_scalerank4",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "poi_label",
+    "minzoom": 16,
+    "maxzoom": 22,
+    "filter": ["all", ["in", "maki", "park", "cemetery", "golf", "zoo", "playground", ""], ["==", "scalerank", 4]],
+    "layout": {
+      "text-line-height": 1.2,
+      "text-allow-overlap": false,
+      "symbol-min-distance": 250,
+      "icon-image": "{maki}-11",
+      "text-ignore-placement": false,
+      "text-max-angle": 38,
+      "text-max-size": "@poi-scalerank4",
+      "text-font": "DIN Offc Pro Medium, Arial Unicode MS Regular",
+      "symbol-placement": "point",
+      "text-padding": 1,
+      "visibility": "visible",
+      "text-offset": [0, 1],
+      "icon-optional": false,
+      "text-rotation-alignment": "viewport",
+      "text-anchor": "top",
+      "text-field": "{name_en}",
+      "text-letter-spacing": 0.02,
+      "text-max-width": 8
+    },
+    "paint": {
+      "text-color": "@label-park",
+      "text-halo-color": "@halo",
+      "text-halo-width": 1,
+      "text-size": "@poi-scalerank4"
+    }
+  }, {
+    "id": "poi-scalerank4-l1",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "poi_label",
+    "minzoom": 16,
+    "maxzoom": 22,
+    "filter": ["all", ["!in", "maki", "rail-light", "rail-metro", "rail", "airport", "airfield", "heliport", "rocket", "park", "golf", "cemetery", "zoo", "campsite", "swimming", "dog-park"], ["==", "scalerank", 4], ["<=", "localrank", 14]],
+    "layout": {
+      "text-line-height": 1.2,
+      "text-allow-overlap": false,
+      "symbol-min-distance": 250,
+      "icon-image": "{maki}-11",
+      "text-ignore-placement": false,
+      "text-max-angle": 38,
+      "text-max-size": "@poi-scalerank4",
+      "text-font": "DIN Offc Pro Medium, Arial Unicode MS Regular",
+      "symbol-placement": "point",
+      "text-padding": 1,
+      "visibility": "visible",
+      "text-offset": [0, 1],
+      "icon-optional": false,
+      "text-rotation-alignment": "viewport",
+      "text-anchor": "top",
+      "text-field": "{name_en}",
+      "text-letter-spacing": 0.02,
+      "text-max-width": 8
+    },
+    "paint": {
+      "text-color": "@label-poi",
+      "text-halo-color": "@halo",
+      "text-halo-width": 1,
+      "text-size": "@poi-scalerank4"
+    }
+  }, {
+    "id": "poi-scalerank4-l15",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "poi_label",
+    "minzoom": 17,
+    "maxzoom": 22,
+    "filter": ["all", ["!in", "maki", "rail-light", "rail-metro", "rail", "airport", "airfield", "heliport", "rocket", "park", "golf", "cemetery", "zoo", "campsite", "swimming", "dog-park"], ["==", "scalerank", 4], [">=", "localrank", 15]],
+    "layout": {
+      "text-line-height": 1.2,
+      "text-allow-overlap": false,
+      "symbol-min-distance": 250,
+      "icon-image": "{maki}-11",
+      "text-ignore-placement": false,
+      "text-max-angle": 38,
+      "text-max-size": "@poi-scalerank4",
+      "text-font": "DIN Offc Pro Medium, Arial Unicode MS Regular",
+      "symbol-placement": "point",
+      "text-padding": 2,
+      "visibility": "visible",
+      "text-offset": [0, 1],
+      "icon-optional": false,
+      "text-rotation-alignment": "viewport",
+      "text-anchor": "top",
+      "text-field": "{name_en}",
+      "text-letter-spacing": 0.02,
+      "text-max-width": 8
+    },
+    "paint": {
+      "text-color": "@label-poi",
+      "text-halo-color": "@halo",
+      "text-halo-width": 1,
+      "text-size": "@poi-scalerank4"
+    }
+  }, {
+    "id": "waterway-label",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "waterway_label",
+    "minzoom": 12,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "class", "river"]],
+    "layout": {
+      "text-field": "{name_en}",
+      "visibility": "visible",
+      "text-font": "DIN Offc Pro Italic, Arial Unicode MS Regular",
+      "symbol-placement": "line",
+      "text-max-angle": 30
+    },
+    "paint": {
+      "text-halo-width": 0.5,
+      "text-size": {
+        "base": 1,
+        "stops": [[13, 12], [18, 16]]
+      },
+      "text-halo-color": "@halo",
+      "text-color": "@label-water-dark",
+      "text-halo-blur": 0.5
+    }
+  }, {
+    "id": "contour-index-label",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-terrain-v2",
+    "source-layer": "contour",
+    "minzoom": 14,
+    "maxzoom": 22,
+    "filter": ["all", ["==", "index", 5]],
+    "layout": {
+      "text-field": "{ele} m",
+      "symbol-placement": "line",
+      "text-max-size": 9.5,
+      "text-max-angle": 25,
+      "visibility": "visible",
+      "text-padding": 5,
+      "text-font": "DIN Offc Pro Regular, Arial Unicode MS Regular"
+    },
+    "paint": {
+      "text-size": 9.5,
+      "text-color": "#a7a696",
+      "text-halo-width": 1,
+      "text-halo-blur": 1,
+      "text-halo-color": "rgba(237,233,217, 0.25)"
+    }
+  }, {
+    "id": "housenum-label",
+    "type": "symbol",
+    "source": "mapbox://mapbox.mapbox-streets-v6",
+    "source-layer": "housenum_label",
+    "minzoom": 17,
+    "maxzoom": 22,
+    "layout": {
+      "visibility": "visible",
+      "text-field": "{house_num}",
+      "text-font": "DIN Offc Pro Italic, Arial Unicode MS Regular",
+      "symbol-placement": "point",
+      "text-max-size": 9.5,
+      "text-padding": 4,
+      "text-max-width": 7
+    },
+    "paint": {
+      "text-size": 9.5,
+      "text-color": "#b2aca5",
+      "text-halo-color": "@building",
+      "text-halo-width": 1.5,
+      "text-halo-blur": 0
+    }
+  }],
+  "owner": "nicki",
+  "modified": "2015-04-22T21:56:16.821Z",
+  "created": "2015-04-20T17:11:47.261Z",
+  "id": "nicki.be444c8f"
+}
\ No newline at end of file
diff --git a/ios/benchmark/assets/tiles/download.sh b/ios/benchmark/assets/tiles/download.sh
new file mode 100755
index 000000000..23b00f924
--- /dev/null
+++ b/ios/benchmark/assets/tiles/download.sh
@@ -0,0 +1,175 @@
+#!/usr/bin/env bash
+
+set -u
+
+LIST=(
+    # paris
+    "mapbox.mapbox-streets-v6/11/1037/704.vector.pbf"
+    "mapbox.mapbox-streets-v6/11/1037/705.vector.pbf"
+    "mapbox.mapbox-streets-v6/11/1038/704.vector.pbf"
+    "mapbox.mapbox-streets-v6/11/1038/705.vector.pbf"
+    "mapbox.mapbox-streets-v6/11/1036/704.vector.pbf"
+    "mapbox.mapbox-streets-v6/11/1037/703.vector.pbf"
+    "mapbox.mapbox-streets-v6/11/1036/705.vector.pbf"
+    "mapbox.mapbox-streets-v6/11/1038/703.vector.pbf"
+    "mapbox.mapbox-streets-v6/11/1036/703.vector.pbf"
+    "mapbox.mapbox-terrain-v2/11/1037/704.vector.pbf"
+    "mapbox.mapbox-terrain-v2/11/1037/705.vector.pbf"
+    "mapbox.mapbox-terrain-v2/11/1038/704.vector.pbf"
+    "mapbox.mapbox-terrain-v2/11/1038/705.vector.pbf"
+    "mapbox.mapbox-terrain-v2/11/1036/704.vector.pbf"
+    "mapbox.mapbox-terrain-v2/11/1037/703.vector.pbf"
+    "mapbox.mapbox-terrain-v2/11/1036/705.vector.pbf"
+    "mapbox.mapbox-terrain-v2/11/1038/703.vector.pbf"
+    "mapbox.mapbox-terrain-v2/11/1036/703.vector.pbf"
+
+    # paris2
+    "mapbox.mapbox-streets-v6/13/4150/2819.vector.pbf"
+    "mapbox.mapbox-streets-v6/13/4149/2819.vector.pbf"
+    "mapbox.mapbox-streets-v6/13/4150/2818.vector.pbf"
+    "mapbox.mapbox-streets-v6/13/4149/2820.vector.pbf"
+    "mapbox.mapbox-streets-v6/13/4148/2819.vector.pbf"
+    "mapbox.mapbox-streets-v6/13/4149/2818.vector.pbf"
+    "mapbox.mapbox-streets-v6/13/4150/2817.vector.pbf"
+    "mapbox.mapbox-streets-v6/13/4148/2820.vector.pbf"
+    "mapbox.mapbox-streets-v6/13/4148/2818.vector.pbf"
+    "mapbox.mapbox-streets-v6/13/4149/2817.vector.pbf"
+    "mapbox.mapbox-terrain-v2/13/4150/2819.vector.pbf"
+    "mapbox.mapbox-terrain-v2/13/4149/2819.vector.pbf"
+    "mapbox.mapbox-terrain-v2/13/4150/2818.vector.pbf"
+    "mapbox.mapbox-terrain-v2/13/4149/2820.vector.pbf"
+    "mapbox.mapbox-terrain-v2/13/4148/2819.vector.pbf"
+    "mapbox.mapbox-terrain-v2/13/4149/2818.vector.pbf"
+    "mapbox.mapbox-terrain-v2/13/4150/2817.vector.pbf"
+    "mapbox.mapbox-terrain-v2/13/4148/2820.vector.pbf"
+    "mapbox.mapbox-terrain-v2/13/4148/2818.vector.pbf"
+    "mapbox.mapbox-terrain-v2/13/4149/2817.vector.pbf"
+
+    # alps
+    "mapbox.mapbox-streets-v6/6/34/23.vector.pbf"
+    "mapbox.mapbox-streets-v6/6/34/22.vector.pbf"
+    "mapbox.mapbox-streets-v6/6/33/23.vector.pbf"
+    "mapbox.mapbox-streets-v6/6/33/22.vector.pbf"
+    "mapbox.mapbox-streets-v6/6/34/21.vector.pbf"
+    "mapbox.mapbox-streets-v6/6/32/23.vector.pbf"
+    "mapbox.mapbox-streets-v6/6/32/22.vector.pbf"
+    "mapbox.mapbox-streets-v6/6/33/21.vector.pbf"
+    "mapbox.mapbox-streets-v6/6/32/21.vector.pbf"
+    "mapbox.mapbox-terrain-v2/6/34/23.vector.pbf"
+    "mapbox.mapbox-terrain-v2/6/34/22.vector.pbf"
+    "mapbox.mapbox-terrain-v2/6/33/23.vector.pbf"
+    "mapbox.mapbox-terrain-v2/6/33/22.vector.pbf"
+    "mapbox.mapbox-terrain-v2/6/34/21.vector.pbf"
+    "mapbox.mapbox-terrain-v2/6/32/23.vector.pbf"
+    "mapbox.mapbox-terrain-v2/6/32/22.vector.pbf"
+    "mapbox.mapbox-terrain-v2/6/33/21.vector.pbf"
+    "mapbox.mapbox-terrain-v2/6/32/21.vector.pbf"
+
+    # us east
+    "mapbox.mapbox-streets-v6/5/9/12.vector.pbf"
+    "mapbox.mapbox-streets-v6/5/8/12.vector.pbf"
+    "mapbox.mapbox-streets-v6/5/9/13.vector.pbf"
+    "mapbox.mapbox-streets-v6/5/8/13.vector.pbf"
+    "mapbox.mapbox-streets-v6/5/9/11.vector.pbf"
+    "mapbox.mapbox-streets-v6/5/7/12.vector.pbf"
+    "mapbox.mapbox-streets-v6/5/8/11.vector.pbf"
+    "mapbox.mapbox-streets-v6/5/7/13.vector.pbf"
+    "mapbox.mapbox-streets-v6/5/7/11.vector.pbf"
+    "mapbox.mapbox-terrain-v2/5/9/12.vector.pbf"
+    "mapbox.mapbox-terrain-v2/5/8/12.vector.pbf"
+    "mapbox.mapbox-terrain-v2/5/9/13.vector.pbf"
+    "mapbox.mapbox-terrain-v2/5/8/13.vector.pbf"
+    "mapbox.mapbox-terrain-v2/5/9/11.vector.pbf"
+    "mapbox.mapbox-terrain-v2/5/7/12.vector.pbf"
+    "mapbox.mapbox-terrain-v2/5/8/11.vector.pbf"
+    "mapbox.mapbox-terrain-v2/5/7/13.vector.pbf"
+    "mapbox.mapbox-terrain-v2/5/7/11.vector.pbf"
+
+    # greater la
+    "mapbox.mapbox-streets-v6/9/88/204.vector.pbf"
+    "mapbox.mapbox-streets-v6/9/88/205.vector.pbf"
+    "mapbox.mapbox-streets-v6/9/89/204.vector.pbf"
+    "mapbox.mapbox-streets-v6/9/89/205.vector.pbf"
+    "mapbox.mapbox-streets-v6/9/87/204.vector.pbf"
+    "mapbox.mapbox-streets-v6/9/88/203.vector.pbf"
+    "mapbox.mapbox-streets-v6/9/87/205.vector.pbf"
+    "mapbox.mapbox-streets-v6/9/89/203.vector.pbf"
+    "mapbox.mapbox-streets-v6/9/87/203.vector.pbf"
+    "mapbox.mapbox-terrain-v2/9/88/204.vector.pbf"
+    "mapbox.mapbox-terrain-v2/9/88/205.vector.pbf"
+    "mapbox.mapbox-terrain-v2/9/89/204.vector.pbf"
+    "mapbox.mapbox-terrain-v2/9/89/205.vector.pbf"
+    "mapbox.mapbox-terrain-v2/9/87/204.vector.pbf"
+    "mapbox.mapbox-terrain-v2/9/88/203.vector.pbf"
+    "mapbox.mapbox-terrain-v2/9/87/205.vector.pbf"
+    "mapbox.mapbox-terrain-v2/9/89/203.vector.pbf"
+    "mapbox.mapbox-terrain-v2/9/87/203.vector.pbf"
+
+    # sf
+    "mapbox.mapbox-streets-v6/14/2621/6333.vector.pbf"
+    "mapbox.mapbox-streets-v6/14/2620/6333.vector.pbf"
+    "mapbox.mapbox-streets-v6/14/2621/6334.vector.pbf"
+    "mapbox.mapbox-streets-v6/14/2620/6334.vector.pbf"
+    "mapbox.mapbox-streets-v6/14/2621/6332.vector.pbf"
+    "mapbox.mapbox-streets-v6/14/2619/6333.vector.pbf"
+    "mapbox.mapbox-streets-v6/14/2620/6332.vector.pbf"
+    "mapbox.mapbox-streets-v6/14/2619/6334.vector.pbf"
+    "mapbox.mapbox-streets-v6/14/2619/6332.vector.pbf"
+    "mapbox.mapbox-terrain-v2/14/2621/6333.vector.pbf"
+    "mapbox.mapbox-terrain-v2/14/2620/6333.vector.pbf"
+    "mapbox.mapbox-terrain-v2/14/2621/6334.vector.pbf"
+    "mapbox.mapbox-terrain-v2/14/2620/6334.vector.pbf"
+    "mapbox.mapbox-terrain-v2/14/2621/6332.vector.pbf"
+    "mapbox.mapbox-terrain-v2/14/2619/6333.vector.pbf"
+    "mapbox.mapbox-terrain-v2/14/2620/6332.vector.pbf"
+    "mapbox.mapbox-terrain-v2/14/2619/6334.vector.pbf"
+    "mapbox.mapbox-terrain-v2/14/2619/6332.vector.pbf"
+
+    # oakland
+    "mapbox.mapbox-streets-v6/12/657/1582.vector.pbf"
+    "mapbox.mapbox-streets-v6/12/657/1583.vector.pbf"
+    "mapbox.mapbox-streets-v6/12/658/1582.vector.pbf"
+    "mapbox.mapbox-streets-v6/12/658/1583.vector.pbf"
+    "mapbox.mapbox-streets-v6/12/656/1582.vector.pbf"
+    "mapbox.mapbox-streets-v6/12/657/1581.vector.pbf"
+    "mapbox.mapbox-streets-v6/12/656/1583.vector.pbf"
+    "mapbox.mapbox-streets-v6/12/658/1581.vector.pbf"
+    "mapbox.mapbox-streets-v6/12/656/1581.vector.pbf"
+    "mapbox.mapbox-terrain-v2/12/657/1582.vector.pbf"
+    "mapbox.mapbox-terrain-v2/12/657/1583.vector.pbf"
+    "mapbox.mapbox-terrain-v2/12/658/1582.vector.pbf"
+    "mapbox.mapbox-terrain-v2/12/658/1583.vector.pbf"
+    "mapbox.mapbox-terrain-v2/12/656/1582.vector.pbf"
+    "mapbox.mapbox-terrain-v2/12/657/1581.vector.pbf"
+    "mapbox.mapbox-terrain-v2/12/656/1583.vector.pbf"
+    "mapbox.mapbox-terrain-v2/12/658/1581.vector.pbf"
+    "mapbox.mapbox-terrain-v2/12/656/1581.vector.pbf"
+
+    # germany
+    "mapbox.mapbox-streets-v6/6/34/21.vector.pbf"
+    "mapbox.mapbox-streets-v6/6/34/22.vector.pbf"
+    "mapbox.mapbox-streets-v6/6/33/21.vector.pbf"
+    "mapbox.mapbox-streets-v6/6/33/22.vector.pbf"
+    "mapbox.mapbox-streets-v6/6/34/20.vector.pbf"
+    "mapbox.mapbox-streets-v6/6/32/21.vector.pbf"
+    "mapbox.mapbox-streets-v6/6/33/20.vector.pbf"
+    "mapbox.mapbox-streets-v6/6/32/22.vector.pbf"
+    "mapbox.mapbox-streets-v6/6/32/20.vector.pbf"
+    "mapbox.mapbox-terrain-v2/6/34/21.vector.pbf"
+    "mapbox.mapbox-terrain-v2/6/34/22.vector.pbf"
+    "mapbox.mapbox-terrain-v2/6/33/21.vector.pbf"
+    "mapbox.mapbox-terrain-v2/6/33/22.vector.pbf"
+    "mapbox.mapbox-terrain-v2/6/34/20.vector.pbf"
+    "mapbox.mapbox-terrain-v2/6/32/21.vector.pbf"
+    "mapbox.mapbox-terrain-v2/6/33/20.vector.pbf"
+    "mapbox.mapbox-terrain-v2/6/32/22.vector.pbf"
+    "mapbox.mapbox-terrain-v2/6/32/20.vector.pbf"
+)
+
+for OUTPUT in ${LIST[@]} ; do
+    if [ ! -f "${OUTPUT}" ] ; then
+        mkdir -p "`dirname "${OUTPUT}"`"
+        echo "Downloading tile '${OUTPUT}'"
+        curl -# "https://a.tiles.mapbox.com/v4/${OUTPUT}?access_token=${MAPBOX_ACCESS_TOKEN}" | gunzip > "${OUTPUT}"
+    fi
+done
diff --git a/ios/benchmark/assets/tiles/mapbox.mapbox-streets-v6.json b/ios/benchmark/assets/tiles/mapbox.mapbox-streets-v6.json
new file mode 100644
index 000000000..1d556bf6a
--- /dev/null
+++ b/ios/benchmark/assets/tiles/mapbox.mapbox-streets-v6.json
@@ -0,0 +1 @@
+{"attribution":"<a href=\"https://www.mapbox.com/about/maps/\" target=\"_blank\">&copy; Mapbox &copy; OpenStreetMap</a> <a class=\"mapbox-improve-map\" href=\"https://www.mapbox.com/map-feedback/\" target=\"_blank\">Improve this map</a>","bounds":[-180,-85.0511,180,85.0511],"center":[0,0,0],"description":"","filesize":0,"format":"pbf","id":"mapbox.mapbox-streets-v6","maskLevel":8,"maxzoom":15,"minzoom":0,"name":"Mapbox Streets V6","private":true,"scheme":"xyz","tilejson":"2.0.0","tiles":["asset://tiles/mapbox.mapbox-streets-v6/{z}/{x}/{y}.vector.pbf"],"vector_layers":[{"description":"","fields":{"class":"One of: cemetery, hospital, industrial, park, parking, pitch, sand, school, wood","osm_id":"Unique OSM ID number","type":"OSM tag, more specific than class"},"id":"landuse"},{"description":"","fields":{"class":"One of: river, canal, stream, stream_intermittent, ditch, drain","osm_id":"Unique OSM ID number","type":"One of: river, canal, stream, ditch, drain"},"id":"waterway"},{"description":"","fields":{"osm_id":"Unique OSM ID number"},"id":"water"},{"description":"","fields":{"osm_id":"Unique OSM ID number","type":"One of: runway, taxiway, apron"},"id":"aeroway"},{"description":"","fields":{"class":"One of: fence, hedge, cliff, gate","osm_id":"Unique OSM ID number"},"id":"barrier_line"},{"description":"","fields":{"osm_id":"Unique OSM ID number"},"id":"building"},{"description":"","fields":{"class":"One of: wetland, wetland_noveg","osm_id":"Unique OSM ID number"},"id":"landuse_overlay"},{"description":"","fields":{"class":"One of: motorway, motorway_link, main, street, street_limited, service, driveway, path, major_rail, minor_rail, aerialway","layer":"Number used for ordering overlapping tunnels","oneway":"Number. Oneway roads are 1, all others are 0.","osm_id":"Unique OSM ID number","type":"The value of the tunnel's highway tag"},"id":"tunnel"},{"description":"","fields":{"class":"One of: motorway, motorway_link, main, street, street_limited, service, driveway, path, major_rail, minor_rail, aerialway","oneway":"Number. Oneway roads are 1, all others are 0.","osm_id":"Unique OSM ID number","type":"The value of the road's highway tag"},"id":"road"},{"description":"","fields":{"class":"One of: motorway, motorway_link, main, street, street_limited, service, driveway, path, major_rail, minor_rail, aerialway","layer":"Number used for ordering overlapping bridges","oneway":"Number. Oneway bridges are 1, all others are 0.","osm_id":"Unique OSM ID number","type":"The value of the bridge's highway tag"},"id":"bridge"},{"description":"","fields":{"admin_level":"The OSM administrative level of the boundary","disputed":"Number. Disputed boundaries are 1, all others are 0.","maritime":"Number. Maritime boundaries are 1, all others are 0."},"id":"admin"},{"description":"","fields":{"code":"ISO 3166-1 Alpha-2 code","name":"Local name of the country","name_de":"German name of the country","name_en":"English name of the country","name_es":"Spanish name of the country","name_fr":"French name of the country","name_ru":"Russian name of the country","name_zh":"Chinese name of the country","osm_id":"Unique OSM ID number","parent":"ISO 3166-1 Alpha-2 code of the administering/parent state, if any","scalerank":"Number, 1-6. Useful for styling text sizes.","type":"One of: country, territory, disputed territory, sar"},"id":"country_label"},{"description":"","fields":{"labelrank":"Number, 1-6. Useful for styling text sizes.","name":"Local or international name of the water body","name_de":"German name of the water body","name_en":"English name of the water body","name_es":"Spanish name of the water body","name_fr":"French name of the water body","name_ru":"Russian name of the water body","name_zh":"Chinese name of the water body","placement":"One of: point, line"},"id":"marine_label"},{"description":"","fields":{"abbr":"Abbreviated state name","area":"The area of the state in kilometers²","name":"Local name of the state","name_de":"German name of the state","name_en":"English name of the state","name_es":"Spanish name of the state","name_fr":"French name of the state","name_ru":"Russian name of the state","name_zh":"Chinese name of the state","osm_id":"Unique OSM ID number"},"id":"state_label"},{"description":"","fields":{"capital":"Admin level the city is a capital of, if any. One of: 2, 3, 4, null","ldir":"A hint for label placement at low zoom levels. One of: N, E, S, W, NE, SE, SW, NW, null","localrank":"Number. Priority relative to nearby places. Useful for limiting label density.","name":"Local name of the place","name_de":"German name of the place","name_en":"English name of the place","name_es":"Spanish name of the place","name_fr":"French name of the place","name_ru":"Russian name of the place","name_zh":"Chinese name of the place","osm_id":"Unique OSM ID number","scalerank":"Number, 0-9 or null. Useful for styling text & marker sizes.","type":"One of: city, town, village, hamlet, suburb, neighbourhood"},"id":"place_label"},{"description":"","fields":{"area":"The area of the water polygon in Mercator meters²","name":"Local name of the water body","name_de":"German name of the water body","name_en":"English name of the water body","name_es":"Spanish name of the water body","name_fr":"French name of the water body","name_ru":"Russian name of the water body","name_zh":"Chinese name of the water body","osm_id":"Unique OSM ID number"},"id":"water_label"},{"description":"","fields":{"address":"Street address of the POI","localrank":"Number. Priority relative to nearby POIs. Useful for limiting label density.","maki":"The name of the Maki icon that should be used for the POI","name":"Local name of the POI","name_de":"German name of the POI","name_en":"English name of the POI","name_es":"Spanish name of the POI","name_fr":"French name of the POI","name_ru":"Russian name of the POI","name_zh":"Chinese name of the POI","network":"For rail stations, the network(s) that the station serves. Useful for icon styling.","osm_id":"Unique OSM ID number","ref":"Short reference code, if any","scalerank":"Number. 1-4. Useful for styling icon sizes and minimum zoom levels.","type":"The original OSM tag value","website":"URL of the POI"},"id":"poi_label"},{"description":"","fields":{"class":"One of: motorway, motorway_link, main, street, street_limited, service, driveway, path","len":"Number. Length of the road segment in Mercator meters.","localrank":"Number. Used for shield points only. Priority relative to nearby shields. Useful for limiting shield density.","name":"Local name of the road","name_de":"German name of the road","name_en":"English name of the road","name_es":"Spanish name of the road","name_fr":"French name of the road","name_ru":"Russian name of the road","name_zh":"Chinese name of the road","osm_id":"Unique OSM ID number","ref":"Route number of the road","reflen":"Number. How many characters long the ref tag is. Useful for shield styling.","shield":"The shield style to use. One of: default, mx-federal, mx-state, us-highway, us-highway-alternate, us-highway-business, us-highway-duplex, us-interstate, us-interstate-business, us-interstate-duplex, us-interstate-truck, us-state"},"id":"road_label"},{"description":"","fields":{"class":"One of: river, canal, stream, stream_intermittent","name":"Local name of the waterway","name_de":"German name of the waterway","name_en":"English name of the waterway","name_es":"Spanish name of the waterway","name_fr":"French name of the waterway","name_ru":"Russian name of the waterway","name_zh":"Chinese name of the waterway","osm_id":"Unique OSM ID number","type":"One of: river, canal, stream"},"id":"waterway_label"},{"description":"","fields":{"house_num":"House number","osm_id":"Unique OSM ID number"},"id":"housenum_label"}]}
\ No newline at end of file
diff --git a/ios/benchmark/assets/tiles/mapbox.mapbox-terrain-v2.json b/ios/benchmark/assets/tiles/mapbox.mapbox-terrain-v2.json
new file mode 100644
index 000000000..4ee001abd
--- /dev/null
+++ b/ios/benchmark/assets/tiles/mapbox.mapbox-terrain-v2.json
@@ -0,0 +1 @@
+{"attribution":"<a href=\"https://www.mapbox.com/about/maps/\" target=\"_blank\">&copy; Mapbox &copy; OpenStreetMap</a> <a class=\"mapbox-improve-map\" href=\"https://www.mapbox.com/map-feedback/\" target=\"_blank\">Improve this map</a>","bounds":[-180,-85.0511,180,85.0511],"center":[0,0,3],"description":"","filesize":0,"format":"pbf","id":"mapbox.mapbox-terrain-v2","maskLevel":9,"maxzoom":14,"minzoom":0,"name":"Mapbox Terrain V2","private":true,"scheme":"xyz","tilejson":"2.0.0","tiles":["asset://tiles/mapbox.mapbox-terrain-v2/{z}/{x}/{y}.vector.pbf"],"vector_layers":[{"description":"Generalized landcover classification","fields":{"class":"One of: wood, scrub, grass, crop, snow"},"id":"landcover","maxzoom":22,"minzoom":0},{"description":"","fields":{"class":"One of: shadow, highlight","level":"Brightness %. One of: 94, 90, 89, 78, 67, 56"},"id":"hillshade","maxzoom":22,"minzoom":0},{"description":"Elevation contour polygons","fields":{"ele":"Integer. The elevation of the contour in meters.","index":"Indicator for every 2nd, 5th, or 10th contour. Coastlines are given -1. One of: 2, 5, 10, -1, null"},"id":"contour","maxzoom":22,"minzoom":0}]}
\ No newline at end of file
diff --git a/ios/benchmark/benchmark-ios.gypi b/ios/benchmark/benchmark-ios.gypi
new file mode 100644
index 000000000..0a3440d5c
--- /dev/null
+++ b/ios/benchmark/benchmark-ios.gypi
@@ -0,0 +1,63 @@
+{
+  'includes': [
+    '../../gyp/common.gypi',
+  ],
+  'targets': [
+    { 'target_name': 'ios-bench',
+      'product_name': 'Bench GL',
+      'type': 'executable',
+      'product_extension': 'app',
+      'mac_bundle': 1,
+      'mac_bundle_resources': [
+        '<!@(find ../ios/benchmark/img -type f)',
+        'assets/glyphs',
+        'assets/sprites',
+        'assets/styles',
+        'assets/tiles',
+      ],
+
+      'dependencies': [
+        '../mbgl.gyp:core',
+        '../mbgl.gyp:platform-<(platform_lib)',
+        '../mbgl.gyp:http-<(http_lib)',
+        '../mbgl.gyp:asset-<(asset_lib)',
+        '../mbgl.gyp:cache-<(cache_lib)',
+      ],
+
+      'sources': [
+        './main.m',
+        './MBXBenchAppDelegate.h',
+        './MBXBenchAppDelegate.m',
+        './MBXBenchViewController.h',
+        './MBXBenchViewController.mm',
+        './locations.hpp',
+        './locations.cpp',
+      ],
+
+      'xcode_settings': {
+        'SDKROOT': 'iphoneos',
+        'SUPPORTED_PLATFORMS': 'iphoneos',
+        'IPHONEOS_DEPLOYMENT_TARGET': '7.0',
+        'INFOPLIST_FILE': '../ios/benchmark/app-info.plist',
+        'TARGETED_DEVICE_FAMILY': '1,2',
+        'COMBINE_HIDPI_IMAGES': 'NO', # don't merge @2x.png images into .tiff files
+        'CLANG_ENABLE_OBJC_ARC': 'YES',
+        'CLANG_ENABLE_MODULES': 'YES',
+      },
+
+      'configurations': {
+        'Debug': {
+          'xcode_settings': {
+            'CODE_SIGN_IDENTITY': 'iPhone Developer',
+          },
+        },
+        'Release': {
+          'xcode_settings': {
+            'CODE_SIGN_IDENTITY': 'iPhone Distribution',
+            'ARCHS': [ "arm64" ],
+          },
+        },
+      },
+    }
+  ]
+}
diff --git a/ios/benchmark/fo/MBXBenchViewController.mm b/ios/benchmark/fo/MBXBenchViewController.mm
new file mode 100644
index 000000000..f1079d9e0
--- /dev/null
+++ b/ios/benchmark/fo/MBXBenchViewController.mm
@@ -0,0 +1,140 @@
+#import "MBXBenchViewController.h"
+
+#import <mbgl/ios/MGLMapView.h>
+#import <mbgl/ios/MGLMapView_private.h>
+
+#include "locations.hpp"
+
+#include <chrono>
+
+@interface MBXBenchViewController () <MGLMapViewDelegate>
+
+@property (nonatomic) MGLMapView *mapView;
+
+@end
+
+@implementation MBXBenchViewController
+
+#pragma mark - Setup
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+
+    NSURL* url = [[NSURL alloc] initWithString:@"asset://styles/mapbox-streets-v7.json"];
+    self.mapView = [[MGLMapView alloc] initWithFrame:self.view.bounds accessToken:nil styleURL:url];
+    self.mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+    self.mapView.delegate = self;
+    self.mapView.zoomEnabled = NO;
+    self.mapView.scrollEnabled = NO;
+    self.mapView.rotateEnabled = NO;
+    self.mapView.userInteractionEnabled = YES;
+    [self.mapView setDebugActive:NO];
+
+    [self startBenchmarkIteration];
+
+    [self.view addSubview:self.mapView];
+
+}
+
+using Clock = std::chrono::steady_clock;
+using TimePoint = Clock::time_point;
+template <typename Duration>
+inline int64_t Microseconds(Duration d) {
+    return std::chrono::duration_cast<std::chrono::microseconds>(d).count();
+}
+
+size_t idx = 0;
+enum class State { None, WaitingForAssets, WarmingUp, Benchmarking } state = State::None;
+int frames = 0;
+TimePoint started;
+std::vector<std::pair<std::string, double>> result;
+
+static const int warmupDuration = 20; // frames
+static const int benchmarkDuration = 200; // frames
+
+- (void)startBenchmarkIteration
+{
+    if (mbgl::bench::locations.size() > idx) {
+        const auto& location = mbgl::bench::locations[idx];
+        [self.mapView setCenterCoordinate:CLLocationCoordinate2DMake(location.latitude, location.longitude) zoomLevel:location.zoom animated:NO];
+        self.mapView.direction = location.bearing;
+        state = State::WaitingForAssets;
+        NSLog(@"Benchmarking \"%s\"", location.name.c_str());
+        NSLog(@"- Loading assets...");
+    } else {
+        // Do nothing. The benchmark is completed.
+        NSLog(@"Benchmark completed.");
+        NSLog(@"Result:");
+        size_t colWidth = 0;
+        for (const auto& row : result) {
+            colWidth = std::max(row.first.size(), colWidth);
+        }
+        for (const auto& row : result) {
+            NSLog(@"| %-*s | %4.1f fps |", int(colWidth), row.first.c_str(), row.second);
+        }
+        exit(0);
+    }
+}
+
+- (void)mapViewDidFinishRenderingMap:(MGLMapView *)mapView fullyRendered:(BOOL)fullyRendered
+{
+    (void)mapView;
+    (void)fullyRendered;
+
+    if (state == State::Benchmarking)
+    {
+        frames++;
+        if (frames >= benchmarkDuration)
+        {
+            state = State::None;
+
+            // Report FPS
+            const auto duration = Microseconds(Clock::now() - started);
+            const auto fps = double(frames * 1e6) / duration;
+            result.emplace_back(mbgl::bench::locations[idx].name, fps);
+            NSLog(@"- FPS: %.1f", fps);
+
+            // Start benchmarking the next location.
+            idx++;
+            [self startBenchmarkIteration];
+        } else {
+            [mapView invalidate];
+        }
+        return;
+    }
+
+    else if (state == State::WarmingUp)
+    {
+        frames++;
+        if (frames >= warmupDuration)
+        {
+            frames = 0;
+            state = State::Benchmarking;
+            started = Clock::now();
+            NSLog(@"- Benchmarking for %d frames...", benchmarkDuration);
+        }
+        [mapView invalidate];
+        return;
+    }
+
+    else if (state == State::WaitingForAssets)
+    {
+        if ([mapView isFullyLoaded])
+        {
+            // Start the benchmarking timer.
+            state = State::WarmingUp;
+            [self.mapView emptyMemoryCache];
+            NSLog(@"- Warming up for %d frames...", warmupDuration);
+            [mapView invalidate];
+        }
+        return;
+    }
+}
+
+- (NSUInteger)supportedInterfaceOrientations
+{
+    return UIInterfaceOrientationMaskLandscape;
+}
+
+@end
diff --git a/ios/benchmark/fo/benchmark-ios.gypi b/ios/benchmark/fo/benchmark-ios.gypi
new file mode 100644
index 000000000..0a3440d5c
--- /dev/null
+++ b/ios/benchmark/fo/benchmark-ios.gypi
@@ -0,0 +1,63 @@
+{
+  'includes': [
+    '../../gyp/common.gypi',
+  ],
+  'targets': [
+    { 'target_name': 'ios-bench',
+      'product_name': 'Bench GL',
+      'type': 'executable',
+      'product_extension': 'app',
+      'mac_bundle': 1,
+      'mac_bundle_resources': [
+        '<!@(find ../ios/benchmark/img -type f)',
+        'assets/glyphs',
+        'assets/sprites',
+        'assets/styles',
+        'assets/tiles',
+      ],
+
+      'dependencies': [
+        '../mbgl.gyp:core',
+        '../mbgl.gyp:platform-<(platform_lib)',
+        '../mbgl.gyp:http-<(http_lib)',
+        '../mbgl.gyp:asset-<(asset_lib)',
+        '../mbgl.gyp:cache-<(cache_lib)',
+      ],
+
+      'sources': [
+        './main.m',
+        './MBXBenchAppDelegate.h',
+        './MBXBenchAppDelegate.m',
+        './MBXBenchViewController.h',
+        './MBXBenchViewController.mm',
+        './locations.hpp',
+        './locations.cpp',
+      ],
+
+      'xcode_settings': {
+        'SDKROOT': 'iphoneos',
+        'SUPPORTED_PLATFORMS': 'iphoneos',
+        'IPHONEOS_DEPLOYMENT_TARGET': '7.0',
+        'INFOPLIST_FILE': '../ios/benchmark/app-info.plist',
+        'TARGETED_DEVICE_FAMILY': '1,2',
+        'COMBINE_HIDPI_IMAGES': 'NO', # don't merge @2x.png images into .tiff files
+        'CLANG_ENABLE_OBJC_ARC': 'YES',
+        'CLANG_ENABLE_MODULES': 'YES',
+      },
+
+      'configurations': {
+        'Debug': {
+          'xcode_settings': {
+            'CODE_SIGN_IDENTITY': 'iPhone Developer',
+          },
+        },
+        'Release': {
+          'xcode_settings': {
+            'CODE_SIGN_IDENTITY': 'iPhone Distribution',
+            'ARCHS': [ "arm64" ],
+          },
+        },
+      },
+    }
+  ]
+}
diff --git a/ios/benchmark/img/Icon-40.png b/ios/benchmark/img/Icon-40.png
new file mode 100644
index 000000000..242513318
Binary files /dev/null and b/ios/benchmark/img/Icon-40.png differ
diff --git a/ios/benchmark/img/Icon-40@2x.png b/ios/benchmark/img/Icon-40@2x.png
new file mode 100644
index 000000000..b827b1e5a
Binary files /dev/null and b/ios/benchmark/img/Icon-40@2x.png differ
diff --git a/ios/benchmark/img/Icon-40@3x.png b/ios/benchmark/img/Icon-40@3x.png
new file mode 100644
index 000000000..89c7119ac
Binary files /dev/null and b/ios/benchmark/img/Icon-40@3x.png differ
diff --git a/ios/benchmark/img/Icon-60.png b/ios/benchmark/img/Icon-60.png
new file mode 100644
index 000000000..409fad814
Binary files /dev/null and b/ios/benchmark/img/Icon-60.png differ
diff --git a/ios/benchmark/img/Icon-60@2x.png b/ios/benchmark/img/Icon-60@2x.png
new file mode 100644
index 000000000..89c7119ac
Binary files /dev/null and b/ios/benchmark/img/Icon-60@2x.png differ
diff --git a/ios/benchmark/img/Icon-60@3x.png b/ios/benchmark/img/Icon-60@3x.png
new file mode 100644
index 000000000..158bcfe27
Binary files /dev/null and b/ios/benchmark/img/Icon-60@3x.png differ
diff --git a/ios/benchmark/img/Icon-72.png b/ios/benchmark/img/Icon-72.png
new file mode 100644
index 000000000..eecd90b5e
Binary files /dev/null and b/ios/benchmark/img/Icon-72.png differ
diff --git a/ios/benchmark/img/Icon-72@2x.png b/ios/benchmark/img/Icon-72@2x.png
new file mode 100644
index 000000000..ca28d1fa0
Binary files /dev/null and b/ios/benchmark/img/Icon-72@2x.png differ
diff --git a/ios/benchmark/img/Icon-76.png b/ios/benchmark/img/Icon-76.png
new file mode 100644
index 000000000..0ed2a2673
Binary files /dev/null and b/ios/benchmark/img/Icon-76.png differ
diff --git a/ios/benchmark/img/Icon-76@2x.png b/ios/benchmark/img/Icon-76@2x.png
new file mode 100644
index 000000000..311a1658a
Binary files /dev/null and b/ios/benchmark/img/Icon-76@2x.png differ
diff --git a/ios/benchmark/img/Icon-Small-50.png b/ios/benchmark/img/Icon-Small-50.png
new file mode 100644
index 000000000..a07103474
Binary files /dev/null and b/ios/benchmark/img/Icon-Small-50.png differ
diff --git a/ios/benchmark/img/Icon-Small-50@2x.png b/ios/benchmark/img/Icon-Small-50@2x.png
new file mode 100644
index 000000000..5d7c76d5e
Binary files /dev/null and b/ios/benchmark/img/Icon-Small-50@2x.png differ
diff --git a/ios/benchmark/img/Icon-Small.png b/ios/benchmark/img/Icon-Small.png
new file mode 100644
index 000000000..630d7c04c
Binary files /dev/null and b/ios/benchmark/img/Icon-Small.png differ
diff --git a/ios/benchmark/img/Icon-Small@2x.png b/ios/benchmark/img/Icon-Small@2x.png
new file mode 100644
index 000000000..c0ee89211
Binary files /dev/null and b/ios/benchmark/img/Icon-Small@2x.png differ
diff --git a/ios/benchmark/img/Icon-Small@3x.png b/ios/benchmark/img/Icon-Small@3x.png
new file mode 100644
index 000000000..436a8b404
Binary files /dev/null and b/ios/benchmark/img/Icon-Small@3x.png differ
diff --git a/ios/benchmark/img/Icon.png b/ios/benchmark/img/Icon.png
new file mode 100644
index 000000000..7af0c68a3
Binary files /dev/null and b/ios/benchmark/img/Icon.png differ
diff --git a/ios/benchmark/img/Icon.svg b/ios/benchmark/img/Icon.svg
new file mode 100644
index 000000000..28df6f600
--- /dev/null
+++ b/ios/benchmark/img/Icon.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 15 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-miterlimit:1.41421;">
+    <image x="0" y="0" width="15px" height="15px" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAAQ0lEQVQokcXP2wkAIAxD0Sidvqu5jhTxVXdIPsz/4ZLi3hLkKgsBwOjsX3zBcztKeSvllQKeSlnCQ8GhfA5cHvfk8QNc8hvDN5gIKwAAAABJRU5ErkJggg=="/>
+    <path id="path7143" d="M9.48355,2.89095C8.18827,3.22425 6.67888,4.56018 5.90484,6.38831L4.93731,6.63727C4.23814,6.81719 3.97174,7.44212 3.83781,8.06502L3.65856,8.89868L5.40366,8.44963L7.68238,9.79563L8.13143,11.5407L8.77503,10.9814C9.25592,10.5634 9.67465,10.0284 9.49474,9.32928L9.24577,8.36174C10.4732,6.80143 10.9147,4.8347 10.5814,3.53941L10.3567,2.66627L9.48355,2.89095ZM8.40657,5.10044C8.73798,5.01516 9.08086,5.2177 9.16614,5.54911C9.25142,5.88052 9.04888,6.2234 8.71747,6.30868C8.38606,6.39396 8.04318,6.19142 7.9579,5.86001C7.87262,5.5286 8.07516,5.18572 8.40657,5.10044L8.40657,5.10044ZM5.41251,9.7356L5.18818,10.1154C4.86414,10.664 4.97269,11.7811 4.97269,11.7811C4.97269,11.7811 5.9677,11.3976 6.32753,10.7884L6.55187,10.4086L5.41251,9.7356Z" style="fill:white;fill-rule:nonzero;stroke-width:0.62px;stroke:white;"/>
+</svg>
diff --git a/ios/benchmark/img/Icon@2x.png b/ios/benchmark/img/Icon@2x.png
new file mode 100644
index 000000000..ff5ea0c07
Binary files /dev/null and b/ios/benchmark/img/Icon@2x.png differ
diff --git a/ios/benchmark/img/iTunesArtwork.png b/ios/benchmark/img/iTunesArtwork.png
new file mode 100644
index 000000000..f87c8734b
Binary files /dev/null and b/ios/benchmark/img/iTunesArtwork.png differ
diff --git a/ios/benchmark/img/iTunesArtwork@2x.png b/ios/benchmark/img/iTunesArtwork@2x.png
new file mode 100644
index 000000000..8d456a126
Binary files /dev/null and b/ios/benchmark/img/iTunesArtwork@2x.png differ
diff --git a/ios/benchmark/locations.cpp b/ios/benchmark/locations.cpp
new file mode 100644
index 000000000..9f53877e4
--- /dev/null
+++ b/ios/benchmark/locations.cpp
@@ -0,0 +1,18 @@
+#include "locations.hpp"
+
+namespace mbgl {
+namespace bench {
+
+const std::vector<Location> locations = {
+    { "paris",             2.3411,   48.8664, 11,   0.0 },
+    { "paris2",            2.3516,   48.8356, 13, 273.8 },
+    { "alps",             10.6107,   46.9599,  6,   0.0 },
+    { "us east",         -84.3395,   36.9400,  5,   0.0 },
+    { "greater la",     -117.9529,   34.0259,  9,   0.0 },
+    { "sf",             -122.4202,   37.7625, 14,   0.0 },
+    { "oakland",        -122.2328,   37.8267, 12,   0.0 },
+    { "germany",           9.2280,   50.9262,  6,   0.0 },
+};
+
+}
+}
diff --git a/ios/benchmark/locations.hpp b/ios/benchmark/locations.hpp
new file mode 100644
index 000000000..96f9c6025
--- /dev/null
+++ b/ios/benchmark/locations.hpp
@@ -0,0 +1,23 @@
+#ifndef MBGL_BENCH_LOCATIONS
+#define MBGL_BENCH_LOCATIONS
+
+#include <vector>
+#include <string>
+
+namespace mbgl {
+namespace bench {
+
+struct Location {
+    const std::string name;
+    const double longitude;
+    const double latitude;
+    const double zoom;
+    const double bearing;
+};
+
+extern const std::vector<Location> locations;
+
+}
+}
+
+#endif
\ No newline at end of file
diff --git a/ios/benchmark/main.m b/ios/benchmark/main.m
new file mode 100644
index 000000000..52bb44555
--- /dev/null
+++ b/ios/benchmark/main.m
@@ -0,0 +1,10 @@
+#import <UIKit/UIKit.h>
+
+#import "MBXBenchAppDelegate.h"
+
+int main(int argc, char * argv[])
+{
+    @autoreleasepool {
+        return UIApplicationMain(argc, argv, nil, NSStringFromClass([MBXBenchAppDelegate class]));
+    }
+}
diff --git a/ios/docs/install_docs.sh b/ios/docs/install_docs.sh
index cd6fcdda7..7d4bf279f 100755
--- a/ios/docs/install_docs.sh
+++ b/ios/docs/install_docs.sh
@@ -1,18 +1,28 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 if [ -z `which appledoc` ]; then
     echo "Unable to find appledoc. Consider installing it from source or Homebrew."
     exit 1
 fi
 
-VERSION=$( git tag | grep ^[0-9] | sort -r | sed -n '1p' )
-echo "Creating new docs for $VERSION..."
+OUTPUT="/tmp/`uuidgen`"
+
+VERSION=$( git tag -l ios\* --sort -v:refname | sed -n '1p' | sed 's/ios-v//' )
+echo "Creating new docs for ${VERSION}..."
 echo
 
+README="/tmp/GL-README.md"
+cat ../README.md > ${README}
+echo >> ${README}
+echo -n "#" >> ${README}
+cat ../../CHANGELOG.md >> ${README}
+
 appledoc \
-    --output /tmp/`uuidgen` \
-    --project-name "Mapbox GL $VERSION" \
+    --output ${OUTPUT} \
+    --project-name "Mapbox GL for iOS ${VERSION}" \
     --project-company Mapbox \
     --create-docset \
     --company-id com.mapbox \
+    --ignore ../../include/mbgl/ios/private \
+    --index-desc ${README} \
     ../../include/mbgl/ios
diff --git a/ios/docs/remove_docs.sh b/ios/docs/remove_docs.sh
index 09e2c1d39..747ca0a3a 100755
--- a/ios/docs/remove_docs.sh
+++ b/ios/docs/remove_docs.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 echo
 echo "Removing docs from ~/Library/Developer/Shared/Documentation/DocSets..."
diff --git a/linux/main.cpp b/linux/main.cpp
index 6afa3f7f6..d279e9d8f 100644
--- a/linux/main.cpp
+++ b/linux/main.cpp
@@ -1,4 +1,5 @@
 #include <mbgl/mbgl.hpp>
+#include "../platform/default/default_styles.hpp"
 #include <mbgl/util/std.hpp>
 #include <mbgl/util/uv.hpp>
 #include <mbgl/platform/log.hpp>
@@ -13,14 +14,16 @@
 #include <fstream>
 #include <sstream>
 
+namespace {
 
 std::unique_ptr<GLFWView> view;
 
+}
+
 void quit_handler(int) {
     if (view) {
         mbgl::Log::Info(mbgl::Event::Setup, "waiting for quit...");
-        glfwSetWindowShouldClose(view->window, true);
-        glfwPostEmptyEvent();
+        view->setShouldClose();
     } else {
         exit(0);
     }
@@ -75,6 +78,20 @@ int main(int argc, char *argv[]) {
     map.setBearing(settings.bearing);
     map.setDebug(settings.debug);
 
+    view->setChangeStyleCallback([&map] () {
+        static uint8_t currentStyleIndex;
+
+        if (++currentStyleIndex == mbgl::util::defaultStyles.size()) {
+            currentStyleIndex = 0;
+        }
+
+        const auto& newStyle = mbgl::util::defaultStyles[currentStyleIndex];
+        map.setStyleURL(newStyle.first);
+        view->setWindowTitle(newStyle.second);
+
+        mbgl::Log::Info(mbgl::Event::Setup, std::string("Changed style to: ") + newStyle.first);
+    });
+
     // Set access token if present
     const char *token = getenv("MAPBOX_ACCESS_TOKEN");
     if (token == nullptr) {
@@ -85,12 +102,14 @@ int main(int argc, char *argv[]) {
 
     // Load style
     if (style.empty()) {
-        style = std::string("asset://") + std::string("styles/bright-v7.json");
+        const auto& newStyle = mbgl::util::defaultStyles.front();
+        style = newStyle.first;
+        view->setWindowTitle(newStyle.second);
     }
 
     map.setStyleURL(style);
 
-    int ret = view->run();
+    view->run();
 
     // Save settings
     mbgl::LatLng latLng = map.getLatLng();
@@ -101,5 +120,5 @@ int main(int argc, char *argv[]) {
     settings.debug = map.getDebug();
     settings.save();
 
-    return ret;
+    return 0;
 }
diff --git a/linux/mapboxgl-app.gypi b/linux/mapboxgl-app.gypi
index 433a061e4..35ca322e2 100644
--- a/linux/mapboxgl-app.gypi
+++ b/linux/mapboxgl-app.gypi
@@ -13,15 +13,18 @@
         '../mbgl.gyp:http-<(http_lib)',
         '../mbgl.gyp:asset-<(asset_lib)',
         '../mbgl.gyp:cache-<(cache_lib)',
-        '../mbgl.gyp:bundle_styles',
+        '../mbgl.gyp:copy_styles',
         '../mbgl.gyp:copy_certificate_bundle',
       ],
 
       'sources': [
         'main.cpp',
         '../platform/default/settings_json.cpp',
+        '../platform/default/glfw_view.hpp',
         '../platform/default/glfw_view.cpp',
         '../platform/default/log_stderr.cpp',
+        '../platform/default/default_styles.hpp',
+        '../platform/default/default_styles.cpp',
       ],
 
       'variables' : {
diff --git a/macosx/main.mm b/macosx/main.mm
index add763189..e5a711753 100644
--- a/macosx/main.mm
+++ b/macosx/main.mm
@@ -1,4 +1,5 @@
 #include <mbgl/platform/log.hpp>
+#include "../platform/default/default_styles.hpp"
 #include <mbgl/platform/platform.hpp>
 #include <mbgl/platform/darwin/settings_nsuserdefaults.hpp>
 #include <mbgl/platform/darwin/Reachability.h>
@@ -125,15 +126,31 @@ int main() {
     map.setBearing(settings.bearing);
     map.setDebug(settings.debug);
 
+    view.setChangeStyleCallback([&map, &view] () {
+        static uint8_t currentStyleIndex;
+
+        if (++currentStyleIndex == mbgl::util::defaultStyles.size()) {
+            currentStyleIndex = 0;
+        }
+
+        const auto& newStyle = mbgl::util::defaultStyles[currentStyleIndex];
+        map.setStyleURL(newStyle.first);
+        view.setWindowTitle(newStyle.second);
+
+        mbgl::Log::Info(mbgl::Event::Setup, std::string("Changed style to: ") + newStyle.first);
+    });
+
     // Set access token if present
     NSString *accessToken = [[NSProcessInfo processInfo] environment][@"MAPBOX_ACCESS_TOKEN"];
     if (!accessToken) mbgl::Log::Warning(mbgl::Event::Setup, "No access token set. Mapbox vector tiles won't work.");
     if (accessToken) map.setAccessToken([accessToken cStringUsingEncoding:[NSString defaultCStringEncoding]]);
 
     // Load style
-    map.setStyleURL("asset://styles/bright-v7.json");
+    const auto& newStyle = mbgl::util::defaultStyles.front();
+    map.setStyleURL(newStyle.first);
+    view.setWindowTitle(newStyle.second);
 
-    int ret = view.run();
+    view.run();
 
     [reachability stopNotifier];
 
@@ -146,5 +163,5 @@ int main() {
     settings.debug = map.getDebug();
     settings.save();
 
-    return ret;
+    return 0;
 }
diff --git a/macosx/mapboxgl-app.gypi b/macosx/mapboxgl-app.gypi
index 381795404..c56bca659 100644
--- a/macosx/mapboxgl-app.gypi
+++ b/macosx/mapboxgl-app.gypi
@@ -28,6 +28,8 @@
         '../platform/darwin/reachability.m',
         '../platform/default/glfw_view.hpp',
         '../platform/default/glfw_view.cpp',
+        '../platform/default/default_styles.hpp',
+        '../platform/default/default_styles.cpp',
       ],
 
       'variables' : {
diff --git a/platform/darwin/http_request_nsurl.mm b/platform/darwin/http_request_nsurl.mm
index 0fd4a4e8f..5ab4e1b43 100644
--- a/platform/darwin/http_request_nsurl.mm
+++ b/platform/darwin/http_request_nsurl.mm
@@ -1,8 +1,8 @@
-#include <mbgl/storage/http_request.hpp>
 #include <mbgl/storage/http_context.hpp>
+#include <mbgl/storage/resource.hpp>
 #include <mbgl/storage/response.hpp>
-#include <mbgl/util/uv.hpp>
 
+#include <mbgl/util/std.hpp>
 #include <mbgl/util/time.hpp>
 #include <mbgl/util/parsedate.h>
 
@@ -45,32 +45,33 @@ enum class ResponseStatus : uint8_t {
 
 class HTTPNSURLContext;
 
-class HTTPRequestImpl {
+class HTTPRequest : public RequestBase {
 public:
-    HTTPRequestImpl(HTTPRequest *request, uv_loop_t *loop, std::shared_ptr<const Response> response);
-    ~HTTPRequestImpl();
+    HTTPRequest(HTTPNSURLContext*,
+                const Resource&,
+                Callback,
+                uv_loop_t*,
+                std::shared_ptr<const Response>);
+    ~HTTPRequest();
 
-    void cancel();
-    void cancelTimer();
+    void cancel() override;
+    void retry() override;
 
+private:
     void start();
     void handleResult(NSData *data, NSURLResponse *res, NSError *error);
     void handleResponse();
-
     void retry(uint64_t timeout);
-    void retryImmediately();
-    static void restart(uv_timer_t *timer, int);
 
-private:
     HTTPNSURLContext *context = nullptr;
-    HTTPRequest *request = nullptr;
+    bool cancelled = false;
     NSURLSessionDataTask *task = nullptr;
     std::unique_ptr<Response> response;
     const std::shared_ptr<const Response> existingResponse;
     ResponseStatus status = ResponseStatus::PermanentError;
-    uv_async_t *async = nullptr;
+    uv::async async;
+    uv::timer timer;
     int attempts = 0;
-    uv_timer_t *timer = nullptr;
     enum : bool { PreemptImmediately, ExponentialBackoff } strategy = PreemptImmediately;
 
     static const int maxAttempts = 4;
@@ -78,18 +79,20 @@ private:
 
 // -------------------------------------------------------------------------------------------------
 
-class HTTPNSURLContext : public HTTPContext<HTTPNSURLContext> {
+class HTTPNSURLContext : public HTTPContext {
 public:
     HTTPNSURLContext(uv_loop_t *loop);
     ~HTTPNSURLContext();
 
+    RequestBase* createRequest(const Resource&,
+                               RequestBase::Callback,
+                               uv_loop_t*,
+                               std::shared_ptr<const Response>) override;
+
     NSURLSession *session = nil;
     NSString *userAgent = nil;
 };
 
-template<> pthread_key_t ThreadContext<HTTPNSURLContext>::key{};
-template<> pthread_once_t ThreadContext<HTTPNSURLContext>::once = PTHREAD_ONCE_INIT;
-
 HTTPNSURLContext::HTTPNSURLContext(uv_loop_t *loop_) : HTTPContext(loop_) {
     @autoreleasepool {
         NSURLSessionConfiguration *sessionConfig =
@@ -115,35 +118,43 @@ HTTPNSURLContext::~HTTPNSURLContext() {
     userAgent = nullptr;
 }
 
+RequestBase* HTTPNSURLContext::createRequest(const Resource& resource,
+                                             RequestBase::Callback callback,
+                                             uv_loop_t* loop,
+                                             std::shared_ptr<const Response> response) {
+    return new HTTPRequest(this, resource, callback, loop, response);
+}
+
 // -------------------------------------------------------------------------------------------------
 
-HTTPRequestImpl::HTTPRequestImpl(HTTPRequest *request_, uv_loop_t *loop,
-                                 std::shared_ptr<const Response> existingResponse_)
-    : context(HTTPNSURLContext::Get(loop)),
-      request(request_),
+HTTPRequest::HTTPRequest(HTTPNSURLContext* context_, const Resource& resource_, Callback callback_, uv_loop_t *loop, std::shared_ptr<const Response> existingResponse_)
+    : RequestBase(resource_, callback_),
+      context(context_),
       existingResponse(existingResponse_),
-      async(new uv_async_t) {
-    assert(request);
-    context->addRequest(request);
-
-    async->data = this;
-    uv_async_init(loop, async, [](uv_async_t *as, int) {
-        auto impl = reinterpret_cast<HTTPRequestImpl *>(as->data);
-        impl->handleResponse();
-    });
-
+      async(loop, [this] { handleResponse(); }),
+      timer(loop) {
+    context->addRequest(this);
     start();
 }
 
-void HTTPRequestImpl::start() {
+HTTPRequest::~HTTPRequest() {
+    assert(!task);
+
+    // Stop the backoff timer to avoid re-triggering this request.
+    timer.stop();
+
+    context->removeRequest(this);
+}
+
+void HTTPRequest::start() {
     assert(!task);
 
     attempts++;
 
     @autoreleasepool {
         
-        NSMutableString *url = [[NSMutableString alloc] initWithString:@(request->resource.url.c_str())];
-        if ([[NSUserDefaults standardUserDefaults] objectForKey:@"mapbox_metrics_disabled"] == nil) {
+        NSMutableString *url = [NSMutableString stringWithString:@(resource.url.c_str())];
+        if ([[NSUserDefaults standardUserDefaults] integerForKey:@"MGLMapboxAccountType"] == 0) {
             if ([url rangeOfString:@"?"].location == NSNotFound) {
                 [url appendString:@"?"];
             } else {
@@ -152,8 +163,7 @@ void HTTPRequestImpl::start() {
             [url appendString:@"events=true"];
         }
 
-        NSMutableURLRequest *req = [[NSMutableURLRequest alloc]
-            initWithURL:[NSURL URLWithString:url]];
+        NSMutableURLRequest *req = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:url]];
         if (existingResponse) {
             if (!existingResponse->etag.empty()) {
                 [req addValue:@(existingResponse->etag.c_str()) forHTTPHeaderField:@"If-None-Match"];
@@ -168,19 +178,18 @@ void HTTPRequestImpl::start() {
         task = [context->session dataTaskWithRequest:req
                           completionHandler:^(NSData *data, NSURLResponse *res,
                                               NSError *error) { handleResult(data, res, error); }];
-        [req release];
         [task retain];
         [task resume];
     }
 }
 
-void HTTPRequestImpl::handleResponse() {
+void HTTPRequest::handleResponse() {
     if (task) {
         [task release];
         task = nullptr;
     }
 
-    if (request) {
+    if (!cancelled) {
         if (status == ResponseStatus::TemporaryError && attempts < maxAttempts) {
             strategy = ExponentialBackoff;
             return retry((1 << (attempts - 1)) * 1000);
@@ -193,26 +202,21 @@ void HTTPRequestImpl::handleResponse() {
 
         // Actually return the response.
         if (status == ResponseStatus::NotModified) {
-            request->notify(std::move(response), FileCache::Hint::Refresh);
+            notify(std::move(response), FileCache::Hint::Refresh);
         } else {
-            request->notify(std::move(response), FileCache::Hint::Full);
+            notify(std::move(response), FileCache::Hint::Full);
         }
-
-        context->removeRequest(request);
-        request->ptr = nullptr;
-        delete request;
-        request = nullptr;
     }
 
     delete this;
 }
 
-void HTTPRequestImpl::cancel() {
-    context->removeRequest(request);
-    request = nullptr;
+void HTTPRequest::cancel() {
+    context->removeRequest(this);
+    cancelled = true;
 
     // Stop the backoff timer to avoid re-triggering this request.
-    cancelTimer();
+    timer.stop();
 
     if (task) {
         [task cancel];
@@ -223,29 +227,6 @@ void HTTPRequestImpl::cancel() {
     }
 }
 
-void HTTPRequestImpl::cancelTimer() {
-    if (timer) {
-        uv_timer_stop(timer);
-        uv::close(timer);
-        timer = nullptr;
-    }
-}
-
-HTTPRequestImpl::~HTTPRequestImpl() {
-    assert(!task);
-    assert(async);
-
-    // Stop the backoff timer to avoid re-triggering this request.
-    cancelTimer();
-
-    uv::close(async);
-
-    if (request) {
-        context->removeRequest(request);
-        request->ptr = nullptr;
-    }
-}
-
 int64_t parseCacheControl(const char *value) {
     if (value) {
         unsigned long long seconds = 0;
@@ -261,7 +242,7 @@ int64_t parseCacheControl(const char *value) {
     return 0;
 }
 
-void HTTPRequestImpl::handleResult(NSData *data, NSURLResponse *res, NSError *error) {
+void HTTPRequest::handleResult(NSData *data, NSURLResponse *res, NSError *error) {
     if (error) {
         if ([error code] == NSURLErrorCancelled) {
             status = ResponseStatus::Canceled;
@@ -361,73 +342,28 @@ void HTTPRequestImpl::handleResult(NSData *data, NSURLResponse *res, NSError *er
         response->message = "response class is not NSHTTPURLResponse";
     }
 
-    uv_async_send(async);
+    async.send();
 }
 
-void HTTPRequestImpl::retry(uint64_t timeout) {
+void HTTPRequest::retry(uint64_t timeout) {
     response.reset();
 
-    assert(!timer);
-    timer = new uv_timer_t;
-    timer->data = this;
-    uv_timer_init(async->loop, timer);
-    uv_timer_start(timer, restart, timeout, 0);
+    timer.stop();
+    timer.start(timeout, 0, [this] { start(); });
 }
 
-void HTTPRequestImpl::retryImmediately() {
+void HTTPRequest::retry() {
     // All batons get notified when the network status changed, but some of them
     // might not actually wait for the network to become available again.
-    if (timer && strategy == PreemptImmediately) {
+    if (strategy == PreemptImmediately) {
         // Triggers the timer upon the next event loop iteration.
-        uv_timer_stop(timer);
-        uv_timer_start(timer, restart, 0, 0);
+        timer.stop();
+        timer.start(0, 0, [this] { start(); });
     }
 }
 
-void HTTPRequestImpl::restart(uv_timer_t *timer, int) {
-    // Restart the request.
-    auto impl = reinterpret_cast<HTTPRequestImpl *>(timer->data);
-
-    // Get rid of the timer.
-    impl->timer = nullptr;
-    uv::close(timer);
-
-    impl->start();
-}
-
-// -------------------------------------------------------------------------------------------------
-
-HTTPRequest::HTTPRequest(DefaultFileSource::Impl *source, const Resource &resource)
-    : SharedRequestBase(source, resource) {
-}
-
-HTTPRequest::~HTTPRequest() {
-    MBGL_VERIFY_THREAD(tid);
-
-    if (ptr) {
-        reinterpret_cast<HTTPRequestImpl *>(ptr)->cancel();
-    }
-}
-
-void HTTPRequest::start(uv_loop_t *loop, std::shared_ptr<const Response> response) {
-    MBGL_VERIFY_THREAD(tid);
-
-    assert(!ptr);
-    ptr = new HTTPRequestImpl(this, loop, response);
-}
-
-void HTTPRequest::retryImmediately() {
-    MBGL_VERIFY_THREAD(tid);
-
-    if (ptr) {
-        reinterpret_cast<HTTPRequestImpl *>(ptr)->retryImmediately();
-    }
-}
-
-void HTTPRequest::cancel() {
-    MBGL_VERIFY_THREAD(tid);
-
-    delete this;
+std::unique_ptr<HTTPContext> HTTPContext::createContext(uv_loop_t* loop) {
+    return util::make_unique<HTTPNSURLContext>(loop);
 }
 
 }
diff --git a/platform/darwin/nsthread.mm b/platform/darwin/nsthread.mm
new file mode 100644
index 000000000..9ac1d2caa
--- /dev/null
+++ b/platform/darwin/nsthread.mm
@@ -0,0 +1,13 @@
+#import <Foundation/Foundation.h>
+
+#include <mbgl/platform/platform.hpp>
+
+namespace mbgl {
+namespace platform {
+
+void makeThreadLowPriority() {
+    [[NSThread currentThread] setThreadPriority:0.0];
+}
+
+}
+}
diff --git a/platform/default/asset_request_fs.cpp b/platform/default/asset_request_fs.cpp
index a7d813b72..9dae2e8a9 100644
--- a/platform/default/asset_request_fs.cpp
+++ b/platform/default/asset_request_fs.cpp
@@ -1,32 +1,26 @@
-#include <mbgl/storage/asset_request.hpp>
+#include <mbgl/storage/asset_context.hpp>
+#include <mbgl/storage/resource.hpp>
 #include <mbgl/storage/response.hpp>
 #include <mbgl/util/std.hpp>
 #include <mbgl/util/util.hpp>
+#include <mbgl/util/url.hpp>
 #include <mbgl/util/uv.hpp>
 
 #include <uv.h>
 
-#pragma GCC diagnostic push
-#ifndef __clang__
-#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
-#pragma GCC diagnostic ignored "-Wshadow"
-#endif
-#include <boost/algorithm/string.hpp>
-#pragma GCC diagnostic pop
-
 #include <cassert>
-
-
-namespace algo = boost::algorithm;
+#include <limits>
 
 namespace mbgl {
 
-class AssetRequestImpl {
+class AssetRequest : public RequestBase {
     MBGL_STORE_THREAD(tid)
 
 public:
-    AssetRequestImpl(AssetRequest *request, uv_loop_t *loop);
-    ~AssetRequestImpl();
+    AssetRequest(const Resource&, Callback, uv_loop_t*, const std::string& assetRoot);
+    ~AssetRequest();
+
+    void cancel() override;
 
     static void fileOpened(uv_fs_t *req);
     static void fileStated(uv_fs_t *req);
@@ -35,8 +29,7 @@ public:
     static void notifyError(uv_fs_t *req);
     static void cleanup(uv_fs_t *req);
 
-
-    AssetRequest *request = nullptr;
+    std::string assetRoot;
     bool canceled = false;
     uv_fs_t req;
     uv_file fd = -1;
@@ -44,33 +37,40 @@ public:
     std::unique_ptr<Response> response;
 };
 
-AssetRequestImpl::~AssetRequestImpl() {
-    MBGL_VERIFY_THREAD(tid);
-
-    if (request) {
-        request->ptr = nullptr;
+class AssetFSContext : public AssetContext {
+    RequestBase* createRequest(const Resource& resource,
+                               RequestBase::Callback callback,
+                               uv_loop_t* loop,
+                               const std::string& assetRoot) override {
+        return new AssetRequest(resource, callback, loop, assetRoot);
     }
+};
+
+AssetRequest::~AssetRequest() {
+    MBGL_VERIFY_THREAD(tid);
 }
 
-AssetRequestImpl::AssetRequestImpl(AssetRequest *request_, uv_loop_t *loop) : request(request_) {
+AssetRequest::AssetRequest(const Resource& resource_, Callback callback_, uv_loop_t* loop, const std::string& assetRoot_)
+    : RequestBase(resource_, callback_),
+      assetRoot(assetRoot_) {
     req.data = this;
 
-    const auto &url = request->resource.url;
+    const auto &url = resource.url;
     std::string path;
     if (url.size() <= 8 || url[8] == '/') {
         // This is an empty or absolute path.
-        path = url.substr(8);
+        path = mbgl::util::percentDecode(url.substr(8));
     } else {
         // This is a relative path. Prefix with the application root.
-        path = request->source->assetRoot + "/" + url.substr(8);
+        path = assetRoot + "/" + mbgl::util::percentDecode(url.substr(8));
     }
 
     uv_fs_open(loop, &req, path.c_str(), O_RDONLY, S_IRUSR, fileOpened);
 }
 
-void AssetRequestImpl::fileOpened(uv_fs_t *req) {
+void AssetRequest::fileOpened(uv_fs_t *req) {
     assert(req->data);
-    auto self = reinterpret_cast<AssetRequestImpl *>(req->data);
+    auto self = reinterpret_cast<AssetRequest *>(req->data);
     MBGL_VERIFY_THREAD(self->tid);
 
     if (req->result < 0) {
@@ -93,9 +93,9 @@ void AssetRequestImpl::fileOpened(uv_fs_t *req) {
     }
 }
 
-void AssetRequestImpl::fileStated(uv_fs_t *req) {
+void AssetRequest::fileStated(uv_fs_t *req) {
     assert(req->data);
-    auto self = reinterpret_cast<AssetRequestImpl *>(req->data);
+    auto self = reinterpret_cast<AssetRequest *>(req->data);
     MBGL_VERIFY_THREAD(self->tid);
 
     if (req->result != 0 || self->canceled) {
@@ -121,9 +121,7 @@ void AssetRequestImpl::fileStated(uv_fs_t *req) {
 #else
             response->message = uv_strerror(UV_EFBIG);
 #endif
-            assert(self->request);
-            self->request->notify(std::move(response), FileCache::Hint::No);
-            delete self->request;
+            self->notify(std::move(response), FileCache::Hint::No);
 
             uv_fs_req_cleanup(req);
             uv_fs_close(req->loop, req, self->fd, fileClosed);
@@ -148,9 +146,9 @@ void AssetRequestImpl::fileStated(uv_fs_t *req) {
     }
 }
 
-void AssetRequestImpl::fileRead(uv_fs_t *req) {
+void AssetRequest::fileRead(uv_fs_t *req) {
     assert(req->data);
-    auto self = reinterpret_cast<AssetRequestImpl *>(req->data);
+    auto self = reinterpret_cast<AssetRequest *>(req->data);
     MBGL_VERIFY_THREAD(self->tid);
 
     if (req->result < 0 || self->canceled) {
@@ -160,18 +158,16 @@ void AssetRequestImpl::fileRead(uv_fs_t *req) {
     } else {
         // File was successfully read.
         self->response->status = Response::Successful;
-        assert(self->request);
-        self->request->notify(std::move(self->response), FileCache::Hint::No);
-        delete self->request;
+        self->notify(std::move(self->response), FileCache::Hint::No);
     }
 
     uv_fs_req_cleanup(req);
     uv_fs_close(req->loop, req, self->fd, fileClosed);
 }
 
-void AssetRequestImpl::fileClosed(uv_fs_t *req) {
+void AssetRequest::fileClosed(uv_fs_t *req) {
     assert(req->data);
-    auto self = reinterpret_cast<AssetRequestImpl *>(req->data);
+    auto self = reinterpret_cast<AssetRequest *>(req->data);
     MBGL_VERIFY_THREAD(self->tid);
     (void(self)); // Silence unused variable error in Release mode
 
@@ -182,70 +178,37 @@ void AssetRequestImpl::fileClosed(uv_fs_t *req) {
     cleanup(req);
 }
 
-void AssetRequestImpl::notifyError(uv_fs_t *req) {
+void AssetRequest::notifyError(uv_fs_t *req) {
     assert(req->data);
-    auto self = reinterpret_cast<AssetRequestImpl *>(req->data);
+    auto self = reinterpret_cast<AssetRequest *>(req->data);
     MBGL_VERIFY_THREAD(self->tid);
 
     if (req->result < 0 && !self->canceled && req->result != UV_ECANCELED) {
         auto response = util::make_unique<Response>();
         response->status = Response::Error;
         response->message = uv::getFileRequestError(req);
-        assert(self->request);
-        self->request->notify(std::move(response), FileCache::Hint::No);
-        delete self->request;
+        self->notify(std::move(response), FileCache::Hint::No);
     }
 }
 
-void AssetRequestImpl::cleanup(uv_fs_t *req) {
+void AssetRequest::cleanup(uv_fs_t *req) {
     assert(req->data);
-    auto self = reinterpret_cast<AssetRequestImpl *>(req->data);
+    auto self = reinterpret_cast<AssetRequest *>(req->data);
     MBGL_VERIFY_THREAD(self->tid);
     uv_fs_req_cleanup(req);
     delete self;
 }
 
-// -------------------------------------------------------------------------------------------------
-
-AssetRequest::AssetRequest(DefaultFileSource::Impl *source_, const Resource &resource_)
-    : SharedRequestBase(source_, resource_) {
-    assert(algo::starts_with(resource.url, "asset://"));
-}
-
-AssetRequest::~AssetRequest() {
-    MBGL_VERIFY_THREAD(tid);
-
-    if (ptr) {
-        reinterpret_cast<AssetRequestImpl *>(ptr)->request = nullptr;
-    }
-}
-
-void AssetRequest::start(uv_loop_t *loop, std::shared_ptr<const Response> response) {
-    MBGL_VERIFY_THREAD(tid);
-
-    // We're ignoring the existing response if any.
-    (void(response));
-
-    assert(!ptr);
-    ptr = new AssetRequestImpl(this, loop);
-    // Note: the AssetRequestImpl deletes itself.
-}
-
 void AssetRequest::cancel() {
-    MBGL_VERIFY_THREAD(tid);
+    canceled = true;
+    // uv_cancel fails frequently when the request has already been started.
+    // In that case, we have to let it complete and check the canceled bool
+    // instead. The cancelation callback will delete the AssetRequest object.
+    uv_cancel((uv_req_t *)&req);
+}
 
-    if (ptr) {
-        reinterpret_cast<AssetRequestImpl *>(ptr)->canceled = true;
-
-        // uv_cancel fails frequently when the request has already been started.
-        // In that case, we have to let it complete and check the canceled bool
-        // instead. The cancelation callback will delete the AssetRequest object.
-        uv_cancel((uv_req_t *)&reinterpret_cast<AssetRequestImpl *>(ptr)->req);
-    } else {
-        // This request is canceled before we called start. We're safe to delete
-        // ourselves now.
-        delete this;
-    }
+std::unique_ptr<AssetContext> AssetContext::createContext(uv_loop_t*) {
+    return util::make_unique<AssetFSContext>();
 }
 
 }
diff --git a/platform/default/asset_request_zip.cpp b/platform/default/asset_request_zip.cpp
index 22d426c76..7666000d0 100644
--- a/platform/default/asset_request_zip.cpp
+++ b/platform/default/asset_request_zip.cpp
@@ -1,45 +1,40 @@
-#include <mbgl/storage/asset_request.hpp>
-#include <mbgl/storage/thread_context.hpp>
+#include <mbgl/storage/asset_context.hpp>
 #include <mbgl/android/jni.hpp>
+#include <mbgl/storage/resource.hpp>
 #include <mbgl/storage/response.hpp>
 #include <mbgl/platform/log.hpp>
 #include <mbgl/util/std.hpp>
+#include <mbgl/util/util.hpp>
+#include <mbgl/util/uv.hpp>
 
+#include <uv.h>
 #include "uv_zip.h"
 
-#pragma GCC diagnostic push
-#ifndef __clang__
-#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
-#pragma GCC diagnostic ignored "-Wshadow"
-#endif
-#include <boost/algorithm/string.hpp>
-#pragma GCC diagnostic pop
-
+#include <map>
+#include <cassert>
 #include <forward_list>
 
-namespace algo = boost::algorithm;
-
 namespace mbgl {
 
-class AssetZipContext : public ThreadContext<AssetZipContext> {
+class AssetZipContext : public AssetContext {
 public:
     AssetZipContext(uv_loop_t *loop);
     ~AssetZipContext();
 
+    RequestBase* createRequest(const Resource& resource,
+                               RequestBase::Callback callback,
+                               uv_loop_t* loop,
+                               const std::string& assetRoot) override;
+
     uv_zip_t *getHandle(const std::string &path);
     void returnHandle(const std::string &path, uv_zip_t *zip);
 
-private:
     // A list of resuable uv_zip handles to avoid creating and destroying them all the time.
     std::map<std::string, std::forward_list<uv_zip_t *>> handles;
+    uv_loop_t *loop;
 };
 
-// -------------------------------------------------------------------------------------------------
-
-template<> pthread_key_t ThreadContext<AssetZipContext>::key{};
-template<> pthread_once_t ThreadContext<AssetZipContext>::once = PTHREAD_ONCE_INIT;
-
-AssetZipContext::AssetZipContext(uv_loop_t *loop_) : ThreadContext(loop_) {
+AssetZipContext::AssetZipContext(uv_loop_t *loop_) : loop(loop_) {
 }
 
 uv_zip_t *AssetZipContext::getHandle(const std::string &path) {
@@ -70,20 +65,18 @@ AssetZipContext::~AssetZipContext() {
     handles.clear();
 }
 
-// -------------------------------------------------------------------------------------------------
-
-class AssetRequestImpl {
+class AssetRequest : public RequestBase {
     MBGL_STORE_THREAD(tid)
 
 public:
-    AssetRequestImpl(AssetRequest *request, uv_loop_t *loop);
-    ~AssetRequestImpl();
+    AssetRequest(AssetZipContext&, const Resource&, Callback, const std::string& assetRoot);
+    ~AssetRequest();
 
-    void cancel();
+    void cancel() override;
 
 private:
     AssetZipContext &context;
-    AssetRequest *request = nullptr;
+    bool cancelled = false;
     const std::string root;
     const std::string path;
     std::unique_ptr<Response> response;
@@ -101,21 +94,18 @@ private:
     void notifyError(const char *message);
 };
 
-// -------------------------------------------------------------------------------------------------
-
-AssetRequestImpl::~AssetRequestImpl() {
-    MBGL_VERIFY_THREAD(tid);
-
-    if (request) {
-        request->ptr = nullptr;
-    }
+RequestBase* AssetZipContext::createRequest(const Resource& resource,
+                                            RequestBase::Callback callback,
+                                            uv_loop_t*,
+                                            const std::string& assetRoot) {
+    return new AssetRequest(*this, resource, callback, assetRoot);
 }
 
-AssetRequestImpl::AssetRequestImpl(AssetRequest *request_, uv_loop_t *loop)
-    : context(*AssetZipContext::Get(loop)),
-      request(request_),
-      root(request->source->assetRoot),
-      path(std::string { "assets/" } + request->resource.url.substr(8)) {
+AssetRequest::AssetRequest(AssetZipContext& context_, const Resource& resource_, Callback callback_, const std::string& assetRoot_)
+    : RequestBase(resource_, callback_),
+      context(context_),
+      root(assetRoot_),
+      path(std::string { "assets/" } + resource.url.substr(8)) {
     auto zip = context.getHandle(root);
     if (zip) {
         archiveOpened(zip);
@@ -124,18 +114,19 @@ AssetRequestImpl::AssetRequestImpl(AssetRequest *request_, uv_loop_t *loop)
     }
 }
 
-void AssetRequestImpl::openZipArchive() {
+AssetRequest::~AssetRequest() {
+    MBGL_VERIFY_THREAD(tid);
+}
+
+void AssetRequest::openZipArchive() {
     uv_fs_t *req = new uv_fs_t();
     req->data = this;
 
-    assert(request);
-    assert(request->source);
-
     // We're using uv_fs_open first to obtain a file descriptor. Then, uv_zip_fdopen will operate
     // on a read-only file.
     uv_fs_open(context.loop, req, root.c_str(), O_RDONLY, S_IRUSR, [](uv_fs_t *fsReq) {
         if (fsReq->result < 0) {
-            auto impl = reinterpret_cast<AssetRequestImpl *>(fsReq->data);
+            auto impl = reinterpret_cast<AssetRequest *>(fsReq->data);
             impl->notifyError(uv::getFileRequestError(fsReq));
             delete impl;
         } else {
@@ -143,7 +134,7 @@ void AssetRequestImpl::openZipArchive() {
             uv_zip_init(zip);
             zip->data = fsReq->data;
             uv_zip_fdopen(fsReq->loop, zip, uv_file(fsReq->result), 0, [](uv_zip_t *openZip) {
-                auto impl = reinterpret_cast<AssetRequestImpl *>(openZip->data);
+                auto impl = reinterpret_cast<AssetRequest *>(openZip->data);
                 if (openZip->result < 0) {
                     impl->notifyError(openZip->message);
                     delete openZip;
@@ -163,20 +154,20 @@ void AssetRequestImpl::openZipArchive() {
 #define INVOKE_MEMBER(name) \
     [](uv_zip_t *zip_) { \
         assert(zip_->data); \
-        reinterpret_cast<AssetRequestImpl *>(zip_->data)->name(zip_); \
+        reinterpret_cast<AssetRequest *>(zip_->data)->name(zip_); \
     }
 
-void AssetRequestImpl::archiveOpened(uv_zip_t *zip) {
+void AssetRequest::archiveOpened(uv_zip_t *zip) {
     MBGL_VERIFY_THREAD(tid);
 
     zip->data = this;
     uv_zip_stat(context.loop, zip, path.c_str(), 0, INVOKE_MEMBER(fileStated));
 }
 
-void AssetRequestImpl::fileStated(uv_zip_t *zip) {
+void AssetRequest::fileStated(uv_zip_t *zip) {
     MBGL_VERIFY_THREAD(tid);
 
-    if (!request || zip->result < 0) {
+    if (cancelled || zip->result < 0) {
         // Stat failed, probably because the file doesn't exist.
         if (zip->result < 0) {
             notifyError(zip->message);
@@ -206,14 +197,14 @@ void AssetRequestImpl::fileStated(uv_zip_t *zip) {
     }
 }
 
-void AssetRequestImpl::fileOpened(uv_zip_t *zip) {
+void AssetRequest::fileOpened(uv_zip_t *zip) {
     MBGL_VERIFY_THREAD(tid);
 
     if (zip->result < 0) {
         // Opening failed.
         notifyError(zip->message);
         cleanup(zip);
-    } else if (!request) {
+    } else if (cancelled) {
         // The request was canceled. Close the file again.
         uv_zip_fclose(context.loop, zip, zip->file, INVOKE_MEMBER(fileClosed));
     } else {
@@ -221,23 +212,21 @@ void AssetRequestImpl::fileOpened(uv_zip_t *zip) {
     }
 }
 
-void AssetRequestImpl::fileRead(uv_zip_t *zip) {
+void AssetRequest::fileRead(uv_zip_t *zip) {
     MBGL_VERIFY_THREAD(tid);
 
     if (zip->result < 0) {
         // Reading failed. We still have an open file handle though.
         notifyError(zip->message);
-    } else if (request) {
+    } else if (!cancelled) {
         response->status = Response::Successful;
-        request->notify(std::move(response), FileCache::Hint::No);
-        delete request;
-        assert(request == nullptr);
+        notify(std::move(response), FileCache::Hint::No);
     }
 
     uv_zip_fclose(context.loop, zip, zip->file, INVOKE_MEMBER(fileClosed));
 }
 
-void AssetRequestImpl::fileClosed(uv_zip_t *zip) {
+void AssetRequest::fileClosed(uv_zip_t *zip) {
     MBGL_VERIFY_THREAD(tid);
 
     if (zip->result < 0) {
@@ -247,66 +236,32 @@ void AssetRequestImpl::fileClosed(uv_zip_t *zip) {
     cleanup(zip);
 }
 
-void AssetRequestImpl::cleanup(uv_zip_t *zip) {
+void AssetRequest::cleanup(uv_zip_t *zip) {
     MBGL_VERIFY_THREAD(tid);
 
     context.returnHandle(root, zip);
     delete this;
 }
 
-void AssetRequestImpl::notifyError(const char *message) {
+void AssetRequest::notifyError(const char *message) {
     MBGL_VERIFY_THREAD(tid);
 
-    if (request) {
+    if (!cancelled) {
         response = util::make_unique<Response>();
         response->status = Response::Error;
         response->message = message;
-        request->notify(std::move(response), FileCache::Hint::No);
-        delete request;
-        assert(request == nullptr);
+        notify(std::move(response), FileCache::Hint::No);
     } else {
         // The request was already canceled and deleted.
     }
 }
 
-void AssetRequestImpl::cancel() {
-    request = nullptr;
-}
-
-// -------------------------------------------------------------------------------------------------
-
-AssetRequest::AssetRequest(DefaultFileSource::Impl *source_, const Resource &resource_)
-    : SharedRequestBase(source_, resource_) {
-    assert(algo::starts_with(resource.url, "asset://"));
-}
-
-AssetRequest::~AssetRequest() {
-    MBGL_VERIFY_THREAD(tid);
-
-    if (ptr) {
-        reinterpret_cast<AssetRequestImpl *>(ptr)->cancel();
-    }
-}
-
-void AssetRequest::start(uv_loop_t *loop, std::shared_ptr<const Response> response) {
-    MBGL_VERIFY_THREAD(tid);
-
-    // We're ignoring the existing response if any.
-    (void(response));
-
-    assert(!ptr);
-    ptr = new AssetRequestImpl(this, loop);
-    // Note: the AssetRequestImpl deletes itself.
-}
-
 void AssetRequest::cancel() {
-    MBGL_VERIFY_THREAD(tid);
+    cancelled = true;
+}
 
-    if (ptr) {
-        reinterpret_cast<AssetRequestImpl *>(ptr)->cancel();
-    }
-
-    delete this;
+std::unique_ptr<AssetContext> AssetContext::createContext(uv_loop_t* loop) {
+    return util::make_unique<AssetZipContext>(loop);
 }
 
 }
diff --git a/platform/default/default_styles.cpp b/platform/default/default_styles.cpp
new file mode 100644
index 000000000..a631008a4
--- /dev/null
+++ b/platform/default/default_styles.cpp
@@ -0,0 +1,14 @@
+#include "default_styles.hpp"
+
+namespace mbgl {
+namespace util {
+
+const std::vector<std::pair<std::string, std::string>> defaultStyles = {
+    { "asset://styles/mapbox-streets-v7.json", "Mapbox Streets" },
+    { "asset://styles/emerald-v7.json", "Emerald" },
+    { "asset://styles/light-v7.json", "Light" },
+    { "asset://styles/dark-v7.json", "Dark" }
+};
+
+} // end namespace util
+} // end namespace mbgl
diff --git a/platform/default/default_styles.hpp b/platform/default/default_styles.hpp
new file mode 100644
index 000000000..dc1000930
--- /dev/null
+++ b/platform/default/default_styles.hpp
@@ -0,0 +1,17 @@
+#ifndef MBGL_PLATFORM_DEFAULT_STYLES
+#define MBGL_PLATFORM_DEFAULT_STYLES
+
+#include <vector>
+#include <string>
+
+namespace mbgl {
+namespace util {
+
+// A list of default styles, with the first string being the URL
+// and the second being the user-visible name.
+extern const std::vector<std::pair<std::string, std::string>> defaultStyles;
+
+} // end namespace util
+} // end namespace mbgl
+
+#endif
diff --git a/platform/default/glfw_view.cpp b/platform/default/glfw_view.cpp
index 7cedd634c..8265bb8bb 100644
--- a/platform/default/glfw_view.cpp
+++ b/platform/default/glfw_view.cpp
@@ -1,28 +1,16 @@
 #include <mbgl/platform/default/glfw_view.hpp>
 #include <mbgl/platform/gl.hpp>
 #include <mbgl/platform/log.hpp>
+#include <mbgl/util/gl_helper.hpp>
 
-pthread_once_t loadGLExtensions = PTHREAD_ONCE_INIT;
-
-GLFWView::GLFWView(bool fullscreen_) : fullscreen(fullscreen_) {
-#ifdef NVIDIA
-    glDiscardFramebufferEXT = reinterpret_cast<PFNGLDISCARDFRAMEBUFFEREXTPROC>(glfwGetProcAddress("glDiscardFramebufferEXT"));
-#endif
-}
-
-GLFWView::~GLFWView() {
-    glfwDestroyWindow(window);
-    glfwTerminate();
-}
+#include <cassert>
 
 void glfwError(int error, const char *description) {
     mbgl::Log::Error(mbgl::Event::OpenGL, "GLFW error (%i): %s", error, description);
     assert(false);
 }
 
-void GLFWView::initialize(mbgl::Map *map_) {
-    View::initialize(map_);
-
+GLFWView::GLFWView(bool fullscreen_) : fullscreen(fullscreen_) {
     glfwSetErrorCallback(glfwError);
 
     if (!glfwInit()) {
@@ -63,10 +51,6 @@ void GLFWView::initialize(mbgl::Map *map_) {
     glfwMakeContextCurrent(window);
     glfwSwapInterval(1);
 
-    int width, height;
-    glfwGetWindowSize(window, &width, &height);
-    onResize(window, width, height);
-
     glfwSetCursorPosCallback(window, onMouseMove);
     glfwSetMouseButtonCallback(window, onMouseClick);
     glfwSetWindowSizeCallback(window, onResize);
@@ -74,92 +58,24 @@ void GLFWView::initialize(mbgl::Map *map_) {
     glfwSetScrollCallback(window, onScroll);
     glfwSetKeyCallback(window, onKey);
 
-    pthread_once(&loadGLExtensions, [] {
-        const std::string extensions = reinterpret_cast<const char *>(MBGL_CHECK_ERROR(glGetString(GL_EXTENSIONS)));
-        using namespace mbgl;
-
-        if (extensions.find("GL_KHR_debug") != std::string::npos) {
-            gl::DebugMessageControl = reinterpret_cast<gl::PFNGLDEBUGMESSAGECONTROLPROC>(glfwGetProcAddress("glDebugMessageControl"));
-            gl::DebugMessageInsert = reinterpret_cast<gl::PFNGLDEBUGMESSAGEINSERTPROC>(glfwGetProcAddress("glDebugMessageInsert"));
-            gl::DebugMessageCallback = reinterpret_cast<gl::PFNGLDEBUGMESSAGECALLBACKPROC>(glfwGetProcAddress("glDebugMessageCallback"));
-            gl::GetDebugMessageLog = reinterpret_cast<gl::PFNGLGETDEBUGMESSAGELOGPROC>(glfwGetProcAddress("glGetDebugMessageLog"));
-            gl::GetPointerv = reinterpret_cast<gl::PFNGLGETPOINTERVPROC>(glfwGetProcAddress("glGetPointerv"));
-            gl::PushDebugGroup = reinterpret_cast<gl::PFNGLPUSHDEBUGGROUPPROC>(glfwGetProcAddress("glPushDebugGroup"));
-            gl::PopDebugGroup = reinterpret_cast<gl::PFNGLPOPDEBUGGROUPPROC>(glfwGetProcAddress("glPopDebugGroup"));
-            gl::ObjectLabel = reinterpret_cast<gl::PFNGLOBJECTLABELPROC>(glfwGetProcAddress("glObjectLabel"));
-            gl::GetObjectLabel = reinterpret_cast<gl::PFNGLGETOBJECTLABELPROC>(glfwGetProcAddress("glGetObjectLabel"));
-            gl::ObjectPtrLabel = reinterpret_cast<gl::PFNGLOBJECTPTRLABELPROC>(glfwGetProcAddress("glObjectPtrLabel"));
-            gl::GetObjectPtrLabel = reinterpret_cast<gl::PFNGLGETOBJECTPTRLABELPROC>(glfwGetProcAddress("glGetObjectPtrLabel"));
-            assert(gl::DebugMessageControl != nullptr);
-            assert(gl::DebugMessageInsert != nullptr);
-            assert(gl::DebugMessageCallback != nullptr);
-            assert(gl::GetDebugMessageLog != nullptr);
-            assert(gl::GetPointerv != nullptr);
-            assert(gl::PushDebugGroup != nullptr);
-            assert(gl::PopDebugGroup != nullptr);
-            assert(gl::ObjectLabel != nullptr);
-            assert(gl::GetObjectLabel != nullptr);
-            assert(gl::ObjectPtrLabel != nullptr);
-            assert(gl::GetObjectPtrLabel != nullptr);
-        } else {
-            if (extensions.find("GL_ARB_debug_output") != std::string::npos) {
-                gl::DebugMessageControl = reinterpret_cast<gl::PFNGLDEBUGMESSAGECONTROLPROC>(glfwGetProcAddress("glDebugMessageControlARB"));
-                gl::DebugMessageInsert = reinterpret_cast<gl::PFNGLDEBUGMESSAGEINSERTPROC>(glfwGetProcAddress("glDebugMessageInsertARB"));
-                gl::DebugMessageCallback = reinterpret_cast<gl::PFNGLDEBUGMESSAGECALLBACKPROC>(glfwGetProcAddress("glDebugMessageCallbackARB"));
-                gl::GetDebugMessageLog = reinterpret_cast<gl::PFNGLGETDEBUGMESSAGELOGPROC>(glfwGetProcAddress("glGetDebugMessageLogARB"));
-                gl::GetPointerv = reinterpret_cast<gl::PFNGLGETPOINTERVPROC>(glfwGetProcAddress("glGetPointerv"));
-                assert(gl::DebugMessageControl != nullptr);
-                assert(gl::DebugMessageInsert != nullptr);
-                assert(gl::DebugMessageCallback != nullptr);
-                assert(gl::GetDebugMessageLog != nullptr);
-                assert(gl::GetPointerv != nullptr);
-            }
-
-            if (extensions.find("GL_EXT_debug_marker") != std::string::npos) {
-                gl::InsertEventMarkerEXT = reinterpret_cast<gl::PFNGLINSERTEVENTMARKEREXTPROC>(glfwGetProcAddress("glInsertEventMarkerEXT"));
-                gl::PushGroupMarkerEXT = reinterpret_cast<gl::PFNGLPUSHGROUPMARKEREXTPROC>(glfwGetProcAddress("glPushGroupMarkerEXT"));
-                gl::PopGroupMarkerEXT = reinterpret_cast<gl::PFNGLPOPGROUPMARKEREXTPROC>(glfwGetProcAddress("glPopGroupMarkerEXT"));
-                assert(gl::InsertEventMarkerEXT != nullptr);
-                assert(gl::PushGroupMarkerEXT != nullptr);
-                assert(gl::PopGroupMarkerEXT != nullptr);
-            }
-
-            if (extensions.find("GL_EXT_debug_label") != std::string::npos) {
-                gl::LabelObjectEXT = reinterpret_cast<gl::PFNGLLABELOBJECTEXTPROC>(glfwGetProcAddress("glLabelObjectEXT"));
-                gl::GetObjectLabelEXT = reinterpret_cast<gl::PFNGLGETOBJECTLABELEXTPROC>(glfwGetProcAddress("glGetObjectLabelEXT"));
-                assert(gl::LabelObjectEXT != nullptr);
-                assert(gl::GetObjectLabelEXT != nullptr);
-            }
-        }
-
-        if (extensions.find("GL_ARB_vertex_array_object") != std::string::npos) {
-            gl::BindVertexArray = reinterpret_cast<gl::PFNGLBINDVERTEXARRAYPROC>(glfwGetProcAddress("glBindVertexArray"));
-            gl::DeleteVertexArrays = reinterpret_cast<gl::PFNGLDELETEVERTEXARRAYSPROC>(glfwGetProcAddress("glDeleteVertexArrays"));
-            gl::GenVertexArrays = reinterpret_cast<gl::PFNGLGENVERTEXARRAYSPROC>(glfwGetProcAddress("glGenVertexArrays"));
-            gl::IsVertexArray = reinterpret_cast<gl::PFNGLISVERTEXARRAYPROC>(glfwGetProcAddress("glIsVertexArray"));
-            assert(gl::BindVertexArray != nullptr);
-            assert(gl::DeleteVertexArrays != nullptr);
-            assert(gl::GenVertexArrays != nullptr);
-            assert(gl::IsVertexArray != nullptr);
-        } else if (extensions.find("GL_APPLE_vertex_array_object") != std::string::npos) {
-            gl::BindVertexArray = reinterpret_cast<gl::PFNGLBINDVERTEXARRAYPROC>(glfwGetProcAddress("glBindVertexArrayAPPLE"));
-            gl::DeleteVertexArrays = reinterpret_cast<gl::PFNGLDELETEVERTEXARRAYSPROC>(glfwGetProcAddress("glDeleteVertexArraysAPPLE"));
-            gl::GenVertexArrays = reinterpret_cast<gl::PFNGLGENVERTEXARRAYSPROC>(glfwGetProcAddress("glGenVertexArraysAPPLE"));
-            gl::IsVertexArray = reinterpret_cast<gl::PFNGLISVERTEXARRAYPROC>(glfwGetProcAddress("glIsVertexArrayAPPLE"));
-            assert(gl::BindVertexArray != nullptr);
-            assert(gl::DeleteVertexArrays != nullptr);
-            assert(gl::GenVertexArrays != nullptr);
-            assert(gl::IsVertexArray != nullptr);
-        }
-
-        // Require packed depth stencil
-        gl::isPackedDepthStencilSupported = true;
-        gl::isDepth24Supported = true;
-    });
+    mbgl::gl::InitializeExtensions(glfwGetProcAddress);
 
     glfwMakeContextCurrent(nullptr);
 }
 
+GLFWView::~GLFWView() {
+    glfwDestroyWindow(window);
+    glfwTerminate();
+}
+
+void GLFWView::initialize(mbgl::Map *map_) {
+    View::initialize(map_);
+
+    int width, height;
+    glfwGetWindowSize(window, &width, &height);
+    onResize(window, width, height);
+}
+
 void GLFWView::onKey(GLFWwindow *window, int key, int /*scancode*/, int action, int mods) {
     GLFWView *view = reinterpret_cast<GLFWView *>(glfwGetWindowUserPointer(window));
 
@@ -175,6 +91,10 @@ void GLFWView::onKey(GLFWwindow *window, int key, int /*scancode*/, int action,
             if (!mods)
                 view->map->resetPosition();
             break;
+        case GLFW_KEY_S:
+            if (view->changeStyleCallback)
+                view->changeStyleCallback();
+            break;
         case GLFW_KEY_R:
             if (!mods) {
                 view->map->setDefaultTransitionDuration(std::chrono::milliseconds(300));
@@ -221,7 +141,7 @@ void GLFWView::onResize(GLFWwindow *window, int width, int height ) {
     int fbWidth, fbHeight;
     glfwGetFramebufferSize(window, &fbWidth, &fbHeight);
 
-    view->resize(width, height, static_cast<float>(fbWidth) / static_cast<float>(width), fbWidth, fbHeight);
+    view->map->resize(width, height, static_cast<float>(fbWidth) / static_cast<float>(width));
 }
 
 void GLFWView::onMouseClick(GLFWwindow *window, int button, int action, int modifiers) {
@@ -264,21 +184,10 @@ void GLFWView::onMouseMove(GLFWwindow *window, double x, double y) {
     view->lastY = y;
 }
 
-int GLFWView::run() {
-    map->start();
-
+void GLFWView::run() {
     while (!glfwWindowShouldClose(window)) {
         glfwWaitEvents();
     }
-
-    map->stop([]() {
-        glfwWaitEvents();
-    });
-
-    // Terminate here to save binary shaders
-    map->terminate();
-
-    return 0;
 }
 
 void GLFWView::activate() {
@@ -293,9 +202,8 @@ void GLFWView::notify() {
     glfwPostEmptyEvent();
 }
 
-void GLFWView::invalidate() {
-    assert(map);
-    map->render();
+void GLFWView::invalidate(std::function<void()> render) {
+    render();
     glfwSwapBuffers(window);
     fps();
 }
@@ -314,6 +222,19 @@ void GLFWView::fps() {
     }
 }
 
+void GLFWView::setChangeStyleCallback(std::function<void()> callback) {
+    changeStyleCallback = callback;
+}
+
+void GLFWView::setShouldClose() {
+    glfwSetWindowShouldClose(window, true);
+    glfwPostEmptyEvent();
+}
+
+void GLFWView::setWindowTitle(const std::string& title) {
+    glfwSetWindowTitle(window, (std::string { "Mapbox GL: " } + title).c_str());
+}
+
 namespace mbgl {
 namespace platform {
 
@@ -342,15 +263,20 @@ void showDebugImage(std::string name, const char *data, size_t width, size_t hei
     glfwGetFramebufferSize(debugWindow, &fbWidth, &fbHeight);
     float scale = static_cast<float>(fbWidth) / static_cast<float>(width);
 
-    MBGL_CHECK_ERROR(glPixelZoom(scale, -scale));
-    MBGL_CHECK_ERROR(glRasterPos2f(-1.0f, 1.0f));
-    MBGL_CHECK_ERROR(glDrawPixels(width, height, GL_LUMINANCE, GL_UNSIGNED_BYTE, data));
+    {
+        gl::PreservePixelZoom pixelZoom;
+        gl::PreserveRasterPos rasterPos;
+
+        MBGL_CHECK_ERROR(glPixelZoom(scale, -scale));
+        MBGL_CHECK_ERROR(glRasterPos2f(-1.0f, 1.0f));
+        MBGL_CHECK_ERROR(glDrawPixels(width, height, GL_LUMINANCE, GL_UNSIGNED_BYTE, data));
+    }
+
     glfwSwapBuffers(debugWindow);
 
     glfwMakeContextCurrent(currentWindow);
 }
 
-
 void showColorDebugImage(std::string name, const char *data, size_t logicalWidth, size_t logicalHeight, size_t width, size_t height) {
     glfwInit();
 
@@ -374,14 +300,22 @@ void showColorDebugImage(std::string name, const char *data, size_t logicalWidth
     float xScale = static_cast<float>(fbWidth) / static_cast<float>(width);
     float yScale = static_cast<float>(fbHeight) / static_cast<float>(height);
 
-    MBGL_CHECK_ERROR(glClearColor(0.8, 0.8, 0.8, 1));
-    MBGL_CHECK_ERROR(glClear(GL_COLOR_BUFFER_BIT));
-    MBGL_CHECK_ERROR(glEnable(GL_BLEND));
-    MBGL_CHECK_ERROR(glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
+    {
+        gl::PreserveClearColor clearColor;
+        gl::PreserveBlend blend;
+        gl::PreserveBlendFunc blendFunc;
+        gl::PreservePixelZoom pixelZoom;
+        gl::PreserveRasterPos rasterPos;
+
+        MBGL_CHECK_ERROR(glClearColor(0.8, 0.8, 0.8, 1));
+        MBGL_CHECK_ERROR(glClear(GL_COLOR_BUFFER_BIT));
+        MBGL_CHECK_ERROR(glEnable(GL_BLEND));
+        MBGL_CHECK_ERROR(glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
+        MBGL_CHECK_ERROR(glPixelZoom(xScale, -yScale));
+        MBGL_CHECK_ERROR(glRasterPos2f(-1.0f, 1.0f));
+        MBGL_CHECK_ERROR(glDrawPixels(width, height, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, data));
+    }
 
-    MBGL_CHECK_ERROR(glPixelZoom(xScale, -yScale));
-    MBGL_CHECK_ERROR(glRasterPos2f(-1.0f, 1.0f));
-    MBGL_CHECK_ERROR(glDrawPixels(width, height, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, data));
     glfwSwapBuffers(debugWindow);
 
     glfwMakeContextCurrent(currentWindow);
diff --git a/platform/default/headless_view.cpp b/platform/default/headless_view.cpp
index f8622604e..aa07706d8 100644
--- a/platform/default/headless_view.cpp
+++ b/platform/default/headless_view.cpp
@@ -13,26 +13,8 @@
 #include <cstring>
 #include <cassert>
 
-pthread_once_t loadGLExtensions = PTHREAD_ONCE_INIT;
-
 #ifdef MBGL_USE_CGL
 #include <CoreFoundation/CoreFoundation.h>
-
-typedef void (* CGLProc)(void);
-CGLProc CGLGetProcAddress(const char *proc) {
-    static CFBundleRef framework = nullptr;
-    if (!framework) {
-        framework = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.opengl"));
-        if (!framework) {
-            throw std::runtime_error("Failed to load OpenGL framework.");
-        }
-    }
-
-    CFStringRef name = CFStringCreateWithCString(kCFAllocatorDefault, proc, kCFStringEncodingASCII);
-    CGLProc symbol = reinterpret_cast<CGLProc>(CFBundleGetFunctionPointerForName(framework, name));
-    CFRelease(name);
-    return symbol;
-}
 #elif MBGL_USE_GLX
 #include <GL/glx.h>
 #endif
@@ -41,7 +23,9 @@ namespace mbgl {
 
 HeadlessView::HeadlessView(uint16_t width, uint16_t height, float pixelRatio)
     : display(std::make_shared<HeadlessDisplay>()) {
+    activate();
     resize(width, height, pixelRatio);
+    deactivate();
 }
 
 HeadlessView::HeadlessView(std::shared_ptr<HeadlessDisplay> display_,
@@ -49,7 +33,9 @@ HeadlessView::HeadlessView(std::shared_ptr<HeadlessDisplay> display_,
                            uint16_t height,
                            float pixelRatio)
     : display(display_) {
+    activate();
     resize(width, height, pixelRatio);
+    deactivate();
 }
 
 void HeadlessView::loadExtensions() {
@@ -57,43 +43,26 @@ void HeadlessView::loadExtensions() {
         return;
     }
 
-    pthread_once(&loadGLExtensions, [] {
-        const char *extensionPtr = reinterpret_cast<const char *>(MBGL_CHECK_ERROR(glGetString(GL_EXTENSIONS)));
-
-        if (!extensionPtr) {
-            return;
-        }
-        const std::string extensions = extensionPtr;
-
 #ifdef MBGL_USE_CGL
-        if (extensions.find("GL_APPLE_vertex_array_object") != std::string::npos) {
-            gl::BindVertexArray = reinterpret_cast<gl::PFNGLBINDVERTEXARRAYPROC>(CGLGetProcAddress("glBindVertexArrayAPPLE"));
-            gl::DeleteVertexArrays = reinterpret_cast<gl::PFNGLDELETEVERTEXARRAYSPROC>(CGLGetProcAddress("glDeleteVertexArraysAPPLE"));
-            gl::GenVertexArrays = reinterpret_cast<gl::PFNGLGENVERTEXARRAYSPROC>(CGLGetProcAddress("glGenVertexArraysAPPLE"));
-            gl::IsVertexArray = reinterpret_cast<gl::PFNGLISVERTEXARRAYPROC>(CGLGetProcAddress("glIsVertexArrayAPPLE"));
-            assert(gl::BindVertexArray != nullptr);
-            assert(gl::DeleteVertexArrays != nullptr);
-            assert(gl::GenVertexArrays != nullptr);
-            assert(gl::IsVertexArray != nullptr);
+    gl::InitializeExtensions([](const char * name) {
+        static CFBundleRef framework = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.opengl"));
+        if (!framework) {
+            throw std::runtime_error("Failed to load OpenGL framework.");
         }
-#endif
-#ifdef MBGL_USE_GLX
-        if (extensions.find("GL_ARB_vertex_array_object") != std::string::npos) {
-            gl::BindVertexArray = reinterpret_cast<gl::PFNGLBINDVERTEXARRAYPROC>(glXGetProcAddress((const GLubyte *)"glBindVertexArray"));
-            gl::DeleteVertexArrays = reinterpret_cast<gl::PFNGLDELETEVERTEXARRAYSPROC>(glXGetProcAddress((const GLubyte *)"glDeleteVertexArrays"));
-            gl::GenVertexArrays = reinterpret_cast<gl::PFNGLGENVERTEXARRAYSPROC>(glXGetProcAddress((const GLubyte *)"glGenVertexArrays"));
-            gl::IsVertexArray = reinterpret_cast<gl::PFNGLISVERTEXARRAYPROC>(glXGetProcAddress((const GLubyte *)"glIsVertexArray"));
-            assert(gl::BindVertexArray != nullptr);
-            assert(gl::DeleteVertexArrays != nullptr);
-            assert(gl::GenVertexArrays != nullptr);
-            assert(gl::IsVertexArray != nullptr);
-        }
-#endif
-    });
 
-    // HeadlessView requires packed depth stencil
-    gl::isPackedDepthStencilSupported = true;
-    gl::isDepth24Supported = true;
+        CFStringRef str = CFStringCreateWithCString(kCFAllocatorDefault, name, kCFStringEncodingASCII);
+        void* symbol = CFBundleGetFunctionPointerForName(framework, str);
+        CFRelease(str);
+
+        return reinterpret_cast<gl::glProc>(symbol);
+    });
+#endif
+
+#ifdef MBGL_USE_GLX
+    gl::InitializeExtensions([](const char * name) {
+        return glXGetProcAddress(reinterpret_cast<const GLubyte *>(name));
+    });
+#endif
 
     extensionsLoaded = true;
 }
@@ -150,30 +119,17 @@ bool HeadlessView::isActive() {
     return std::this_thread::get_id() == thread;
 }
 
-void HeadlessView::resize(const uint16_t width, const uint16_t height, const float pixelRatio) {
-    std::lock_guard<std::mutex> lock(prospectiveMutex);
-    prospective = { width, height, pixelRatio };
-}
-
 HeadlessView::Dimensions::Dimensions(uint16_t width_, uint16_t height_, float pixelRatio_)
     : width(width_), height(height_), pixelRatio(pixelRatio_) {
 }
 
-void HeadlessView::discard() {
-    assert(isActive());
-
-    { // Obtain the new values.
-        std::lock_guard<std::mutex> lock(prospectiveMutex);
-        if (current.pixelWidth() == prospective.pixelWidth() && current.pixelHeight() == prospective.pixelHeight()) {
-            return;
-        }
-        current = prospective;
-    }
+void HeadlessView::resize(const uint16_t width, const uint16_t height, const float pixelRatio) {
+    dimensions = { width, height, pixelRatio };
 
     clearBuffers();
 
-    const unsigned int w = current.width * current.pixelRatio;
-    const unsigned int h = current.height * current.pixelRatio;
+    const unsigned int w = dimensions.width * dimensions.pixelRatio;
+    const unsigned int h = dimensions.height * dimensions.pixelRatio;
 
     // Create depth/stencil buffer
     MBGL_CHECK_ERROR(glGenRenderbuffersEXT(1, &fboDepthStencil));
@@ -208,15 +164,13 @@ void HeadlessView::discard() {
         }
         throw std::runtime_error(error.str());
     }
-
-    View::resize(current.width, current.height, current.pixelRatio, w, h);
 }
 
 std::unique_ptr<StillImage> HeadlessView::readStillImage() {
     assert(isActive());
 
-    const unsigned int w = current.pixelWidth();
-    const unsigned int h = current.pixelHeight();
+    const unsigned int w = dimensions.pixelWidth();
+    const unsigned int h = dimensions.pixelHeight();
 
     auto image = util::make_unique<StillImage>();
     image->width = w;
@@ -305,7 +259,6 @@ void HeadlessView::activate() {
 #endif
 
     loadExtensions();
-    discard();
 }
 
 void HeadlessView::deactivate() {
@@ -328,9 +281,8 @@ void HeadlessView::deactivate() {
 #endif
 }
 
-void HeadlessView::invalidate() {
-    assert(map);
-    map->render();
+void HeadlessView::invalidate(std::function<void()> render) {
+    render();
 }
 
 }
diff --git a/platform/default/http_request_curl.cpp b/platform/default/http_request_curl.cpp
index 1672c9cdb..45115b621 100644
--- a/platform/default/http_request_curl.cpp
+++ b/platform/default/http_request_curl.cpp
@@ -1,10 +1,11 @@
-#include <mbgl/storage/http_request.hpp>
 #include <mbgl/storage/http_context.hpp>
+#include <mbgl/storage/resource.hpp>
 #include <mbgl/storage/response.hpp>
 #include <mbgl/util/chrono.hpp>
 #include <mbgl/platform/log.hpp>
 
 #include <mbgl/util/time.hpp>
+#include <mbgl/util/util.hpp>
 
 #include <curl/curl.h>
 
@@ -53,14 +54,20 @@ enum class ResponseStatus : int8_t {
     NotModified,
 };
 
-class HTTPRequestImpl;
+class HTTPRequest;
 
-class HTTPCURLContext : public HTTPContext<HTTPCURLContext> {
+class HTTPCURLContext : public HTTPContext {
+    MBGL_STORE_THREAD(tid)
 
 public:
     HTTPCURLContext(uv_loop_t *loop);
     ~HTTPCURLContext();
 
+    RequestBase* createRequest(const Resource&,
+                               RequestBase::Callback,
+                               uv_loop_t*,
+                               std::shared_ptr<const Response>) override;
+
     static int handleSocket(CURL *handle, curl_socket_t s, int action, void *userp, void *socketp);
     static void perform(uv_poll_t *req, int status, int events);
     static int startTimeout(CURLM *multi, long timeout_ms, void *userp);
@@ -74,7 +81,8 @@ public:
     void returnHandle(CURL *handle);
     void checkMultiInfo();
 
-public:
+    uv_loop_t *loop = nullptr;
+
     // Used as the CURL timer function to periodically check for socket updates.
     uv_timer_t *timeout = nullptr;
 
@@ -90,17 +98,21 @@ public:
     std::queue<CURL *> handles;
 };
 
-
-class HTTPRequestImpl {
+class HTTPRequest : public RequestBase {
     MBGL_STORE_THREAD(tid)
 
 public:
-    HTTPRequestImpl(HTTPRequest *request, uv_loop_t *loop, std::shared_ptr<const Response> response);
-    ~HTTPRequestImpl();
+    HTTPRequest(HTTPCURLContext*,
+                const Resource&,
+                Callback,
+                uv_loop_t*,
+                std::shared_ptr<const Response>);
+    ~HTTPRequest();
+
+    void cancel() override;
+    void retry() override;
 
     void handleResult(CURLcode code);
-    void abandon();
-    void retryImmediately();
 
 private:
     static size_t headerCallback(char *const buffer, const size_t size, const size_t nmemb, void *userp);
@@ -115,9 +127,8 @@ private:
     void finish(ResponseStatus status);
     void start();
 
-private:
     HTTPCURLContext *context = nullptr;
-    HTTPRequest *request = nullptr;
+    bool cancelled = false;
 
     // Will store the current response.
     std::unique_ptr<Response> response;
@@ -175,10 +186,9 @@ private:
 
 // -------------------------------------------------------------------------------------------------
 
-template<> pthread_key_t ThreadContext<HTTPCURLContext>::key{};
-template<> pthread_once_t ThreadContext<HTTPCURLContext>::once = PTHREAD_ONCE_INIT;
-
-HTTPCURLContext::HTTPCURLContext(uv_loop_t *loop_) : HTTPContext(loop_) {
+HTTPCURLContext::HTTPCURLContext(uv_loop_t *loop_)
+    : HTTPContext(loop_),
+      loop(loop_) {
     if (curl_global_init(CURL_GLOBAL_ALL)) {
         throw std::runtime_error("Could not init cURL");
     }
@@ -197,6 +207,11 @@ HTTPCURLContext::HTTPCURLContext(uv_loop_t *loop_) : HTTPContext(loop_) {
 }
 
 HTTPCURLContext::~HTTPCURLContext() {
+    while (!handles.empty()) {
+        curl_easy_cleanup(handles.front());
+        handles.pop();
+    }
+
     curl_multi_cleanup(multi);
     multi = nullptr;
 
@@ -207,6 +222,13 @@ HTTPCURLContext::~HTTPCURLContext() {
     uv::close(timeout);
 }
 
+RequestBase* HTTPCURLContext::createRequest(const Resource& resource,
+                                            RequestBase::Callback callback,
+                                            uv_loop_t* loop_,
+                                            std::shared_ptr<const Response> response) {
+    return new HTTPRequest(this, resource, callback, loop_, response);
+}
+
 CURL *HTTPCURLContext::getHandle() {
     if (!handles.empty()) {
         auto handle = handles.front();
@@ -230,7 +252,7 @@ void HTTPCURLContext::checkMultiInfo() {
     while ((message = curl_multi_info_read(multi, &pending))) {
         switch (message->msg) {
         case CURLMSG_DONE: {
-            HTTPRequestImpl *baton = nullptr;
+            HTTPRequest *baton = nullptr;
             curl_easy_getinfo(message->easy_handle, CURLINFO_PRIVATE, (char *)&baton);
             assert(baton);
             baton->handleResult(message->data.result);
@@ -425,13 +447,12 @@ static CURLcode sslctx_function(CURL * /* curl */, void *sslctx, void * /* parm
 }
 #endif
 
-HTTPRequestImpl::HTTPRequestImpl(HTTPRequest *request_, uv_loop_t *loop, std::shared_ptr<const Response> response_)
-    : context(HTTPCURLContext::Get(loop)),
-      request(request_),
+HTTPRequest::HTTPRequest(HTTPCURLContext* context_, const Resource& resource_, Callback callback_, uv_loop_t*, std::shared_ptr<const Response> response_)
+    : RequestBase(resource_, callback_),
+      context(context_),
       existingResponse(response_),
       handle(context->getHandle()) {
-    assert(request);
-    context->addRequest(request);
+    context->addRequest(this);
 
     // Zero out the error buffer.
     memset(error, 0, sizeof(error));
@@ -462,7 +483,7 @@ HTTPRequestImpl::HTTPRequestImpl(HTTPRequest *request_, uv_loop_t *loop, std::sh
     handleError(curl_easy_setopt(handle, CURLOPT_CAINFO, "ca-bundle.crt"));
 #endif
     handleError(curl_easy_setopt(handle, CURLOPT_FOLLOWLOCATION, 1));
-    handleError(curl_easy_setopt(handle, CURLOPT_URL, request->resource.url.c_str()));
+    handleError(curl_easy_setopt(handle, CURLOPT_URL, resource.url.c_str()));
     handleError(curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, writeCallback));
     handleError(curl_easy_setopt(handle, CURLOPT_WRITEDATA, this));
     handleError(curl_easy_setopt(handle, CURLOPT_HEADERFUNCTION, headerCallback));
@@ -474,28 +495,10 @@ HTTPRequestImpl::HTTPRequestImpl(HTTPRequest *request_, uv_loop_t *loop, std::sh
     start();
 }
 
-void HTTPRequestImpl::abandon() {
-    if (request) {
-        context->removeRequest(request);
-        request = nullptr;
-    }
-}
-
-void HTTPRequestImpl::start() {
-    // Count up the attempts.
-    attempts++;
-
-    // Start requesting the information.
-    handleError(curl_multi_add_handle(context->multi, handle));
-}
-
-HTTPRequestImpl::~HTTPRequestImpl() {
+HTTPRequest::~HTTPRequest() {
     MBGL_VERIFY_THREAD(tid);
 
-    if (request) {
-        context->removeRequest(request);
-        request->ptr = nullptr;
-    }
+    context->removeRequest(this);
 
     handleError(curl_multi_remove_handle(context->multi, handle));
     context->returnHandle(handle);
@@ -514,11 +517,23 @@ HTTPRequestImpl::~HTTPRequestImpl() {
     }
 }
 
+void HTTPRequest::cancel() {
+   delete this;
+}
+
+void HTTPRequest::start() {
+    // Count up the attempts.
+    attempts++;
+
+    // Start requesting the information.
+    handleError(curl_multi_add_handle(context->multi, handle));
+}
+
 // This function is called when we have new data for a request. We just append it to the string
 // containing the previous data.
-size_t HTTPRequestImpl::writeCallback(void *const contents, const size_t size, const size_t nmemb, void *userp) {
+size_t HTTPRequest::writeCallback(void *const contents, const size_t size, const size_t nmemb, void *userp) {
     assert(userp);
-    auto impl = reinterpret_cast<HTTPRequestImpl *>(userp);
+    auto impl = reinterpret_cast<HTTPRequest *>(userp);
     MBGL_VERIFY_THREAD(impl->tid);
 
     if (!impl->response) {
@@ -560,9 +575,9 @@ int64_t parseCacheControl(const char *value) {
     return 0;
 }
 
-size_t HTTPRequestImpl::headerCallback(char *const buffer, const size_t size, const size_t nmemb, void *userp) {
+size_t HTTPRequest::headerCallback(char *const buffer, const size_t size, const size_t nmemb, void *userp) {
     assert(userp);
-    auto baton = reinterpret_cast<HTTPRequestImpl *>(userp);
+    auto baton = reinterpret_cast<HTTPRequest *>(userp);
     MBGL_VERIFY_THREAD(baton->tid);
 
     if (!baton->response) {
@@ -589,8 +604,7 @@ size_t HTTPRequestImpl::headerCallback(char *const buffer, const size_t size, co
     return length;
 }
 
-
-void HTTPRequestImpl::retry(uint64_t timeout) {
+void HTTPRequest::retry(uint64_t timeout) {
     handleError(curl_multi_remove_handle(context->multi, handle));
 
     response.reset();
@@ -602,7 +616,7 @@ void HTTPRequestImpl::retry(uint64_t timeout) {
     uv_timer_start(timer, restart, timeout, 0);
 }
 
-void HTTPRequestImpl::retryImmediately() {
+void HTTPRequest::retry() {
     // All batons get notified when the network status changed, but some of them
     // might not actually wait for the network to become available again.
     if (timer && strategy == PreemptImmediately) {
@@ -613,12 +627,12 @@ void HTTPRequestImpl::retryImmediately() {
 }
 
 #if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10
-void HTTPRequestImpl::restart(uv_timer_t *timer, int) {
+void HTTPRequest::restart(uv_timer_t *timer, int) {
 #else
-void HTTPRequestImpl::restart(uv_timer_t *timer) {
+void HTTPRequest::restart(uv_timer_t *timer) {
 #endif
     // Restart the request.
-    auto baton = reinterpret_cast<HTTPRequestImpl *>(timer->data);
+    auto baton = reinterpret_cast<HTTPRequest *>(timer->data);
 
     // Get rid of the timer.
     baton->timer = nullptr;
@@ -627,7 +641,7 @@ void HTTPRequestImpl::restart(uv_timer_t *timer) {
     baton->start();
 }
 
-void HTTPRequestImpl::finish(ResponseStatus status) {
+void HTTPRequest::finish(ResponseStatus status) {
     if (status == ResponseStatus::TemporaryError && attempts < maxAttempts) {
         strategy = ExponentialBackoff;
         return retry((1 << (attempts - 1)) * 1000);
@@ -640,19 +654,18 @@ void HTTPRequestImpl::finish(ResponseStatus status) {
 
     // Actually return the response.
     if (status == ResponseStatus::NotModified) {
-        request->notify(std::move(response), FileCache::Hint::Refresh);
+        notify(std::move(response), FileCache::Hint::Refresh);
     } else {
-        request->notify(std::move(response), FileCache::Hint::Full);
+        notify(std::move(response), FileCache::Hint::Full);
     }
 
-    delete request;
     delete this;
 }
 
-void HTTPRequestImpl::handleResult(CURLcode code) {
+void HTTPRequest::handleResult(CURLcode code) {
     MBGL_VERIFY_THREAD(tid);
 
-    if (!request) {
+    if (cancelled) {
         // In this case, it doesn't make sense to even process the response even further since
         // the request was canceled anyway.
         delete this;
@@ -720,44 +733,8 @@ void HTTPRequestImpl::handleResult(CURLcode code) {
     throw std::runtime_error("Response hasn't been handled");
 }
 
-// -------------------------------------------------------------------------------------------------
-
-HTTPRequest::HTTPRequest(DefaultFileSource::Impl *source_, const Resource &resource_)
-    : SharedRequestBase(source_, resource_) {
-}
-
-HTTPRequest::~HTTPRequest() {
-    MBGL_VERIFY_THREAD(tid);
-
-    if (ptr) {
-        reinterpret_cast<HTTPRequestImpl *>(ptr)->abandon();
-    }
-}
-
-void HTTPRequest::start(uv_loop_t *loop, std::shared_ptr<const Response> response) {
-    MBGL_VERIFY_THREAD(tid);
-
-    assert(!ptr);
-    ptr = new HTTPRequestImpl(this, loop, response);
-}
-
-void HTTPRequest::retryImmediately() {
-    MBGL_VERIFY_THREAD(tid);
-
-    if (ptr) {
-        reinterpret_cast<HTTPRequestImpl *>(ptr)->retryImmediately();
-    }
-}
-
-void HTTPRequest::cancel() {
-    MBGL_VERIFY_THREAD(tid);
-
-    if (ptr) {
-        delete reinterpret_cast<HTTPRequestImpl *>(ptr);
-        ptr = nullptr;
-    }
-
-    delete this;
+std::unique_ptr<HTTPContext> HTTPContext::createContext(uv_loop_t* loop) {
+    return util::make_unique<HTTPCURLContext>(loop);
 }
 
 }
diff --git a/platform/default/png_reader.cpp b/platform/default/png_reader.cpp
index 91fe007bc..4f8596a7b 100644
--- a/platform/default/png_reader.cpp
+++ b/platform/default/png_reader.cpp
@@ -157,7 +157,7 @@ void PngReader<T>::read(unsigned x0, unsigned y0, unsigned w, unsigned h, char *
     double gamma;
     if (png_get_gAMA(png_ptr, info_ptr, &gamma))
         png_set_gamma(png_ptr, 2.2, gamma);
-    png_set_alpha_mode(png_ptr, PNG_ALPHA_PREMULTIPLIED, 2.2);
+    png_set_alpha_mode(png_ptr, PNG_ALPHA_PREMULTIPLIED, PNG_GAMMA_LINEAR);
 
     if (x0 == 0 && y0 == 0 && w >= width_ && h >= height_)
     {
diff --git a/platform/default/sqlite_cache.cpp b/platform/default/sqlite_cache.cpp
index a57e666e9..fb4cdf74e 100644
--- a/platform/default/sqlite_cache.cpp
+++ b/platform/default/sqlite_cache.cpp
@@ -62,12 +62,12 @@ std::string unifyMapboxURLs(const std::string &url) {
 using namespace mapbox::sqlite;
 
 SQLiteCache::SQLiteCache(const std::string& path_)
-    : thread(util::make_unique<util::Thread<Impl>>("SQLite Cache", path_)) {
+    : thread(util::make_unique<util::Thread<Impl>>("SQLite Cache", util::ThreadPriority::Low, path_)) {
 }
 
 SQLiteCache::~SQLiteCache() = default;
 
-SQLiteCache::Impl::Impl(const std::string& path_)
+SQLiteCache::Impl::Impl(uv_loop_t*, const std::string& path_)
     : path(path_) {
 }
 
@@ -131,7 +131,7 @@ void SQLiteCache::get(const Resource &resource, Callback callback) {
     // Will try to load the URL from the SQLite database and call the callback when done.
     // Note that the callback is probably going to invoked from another thread, so the caller
     // must make sure that it can run in that thread.
-    thread->invokeWithResult(&Impl::get, callback, resource);
+    thread->invokeWithResult(&Impl::get, std::move(callback), resource);
 }
 
 std::unique_ptr<Response> SQLiteCache::Impl::get(const Resource &resource) {
@@ -183,9 +183,9 @@ void SQLiteCache::put(const Resource &resource, std::shared_ptr<const Response>
     // storing a new response or updating the currently stored response, potentially setting a new
     // expiry date.
     if (hint == Hint::Full) {
-        thread->invoke(&Impl::put, resource, std::move(response));
+        thread->invoke(&Impl::put, resource, response);
     } else if (hint == Hint::Refresh) {
-        thread->invoke(&Impl::refresh, resource, int64_t(response->expires));
+        thread->invoke(&Impl::refresh, resource, response->expires);
     }
 }
 
diff --git a/platform/default/sqlite_cache_impl.hpp b/platform/default/sqlite_cache_impl.hpp
index 2ebaa284a..e01400a58 100644
--- a/platform/default/sqlite_cache_impl.hpp
+++ b/platform/default/sqlite_cache_impl.hpp
@@ -3,6 +3,8 @@
 
 #include <mbgl/storage/sqlite_cache.hpp>
 
+typedef struct uv_loop_s uv_loop_t;
+
 namespace mapbox {
 namespace sqlite {
 class Database;
@@ -14,7 +16,7 @@ namespace mbgl {
 
 class SQLiteCache::Impl {
 public:
-    Impl(const std::string &path = ":memory:");
+    Impl(uv_loop_t*, const std::string &path = ":memory:");
     ~Impl();
 
     std::unique_ptr<Response> get(const Resource&);
diff --git a/platform/default/thread.cpp b/platform/default/thread.cpp
new file mode 100644
index 000000000..c0a1069b9
--- /dev/null
+++ b/platform/default/thread.cpp
@@ -0,0 +1,11 @@
+#include <mbgl/platform/platform.hpp>
+
+namespace mbgl {
+namespace platform {
+
+void makeThreadLowPriority() {
+    // no-op
+}
+
+}
+}
diff --git a/platform/ios/MGLAccountManager.m b/platform/ios/MGLAccountManager.m
new file mode 100644
index 000000000..a49433777
--- /dev/null
+++ b/platform/ios/MGLAccountManager.m
@@ -0,0 +1,63 @@
+#import <Foundation/Foundation.h>
+
+#import "MGLAccountManager.h"
+#import "MGLMapboxEvents.h"
+#import "NSProcessInfo+MGLAdditions.h"
+
+@interface MGLAccountManager()
+
+@property (atomic) BOOL mapboxMetricsEnabledSettingShownInApp;
+@property (atomic) NSString *accessToken;
+
+@end
+
+
+@implementation MGLAccountManager
+
+// Can be called from any thread.
+//
++ (instancetype) sharedManager {
+    if (NSProcessInfo.processInfo.mgl_isInterfaceBuilderDesignablesAgent) {
+        return nil;
+    }
+    static dispatch_once_t onceToken;
+    static MGLAccountManager *_sharedManager;
+    void (^setupBlock)() = ^{
+        dispatch_once(&onceToken, ^{
+            _sharedManager = [[self alloc] init];
+            _sharedManager.mapboxMetricsEnabledSettingShownInApp = NO;
+        });
+    };
+    if ( ! [[NSThread currentThread] isMainThread]) {
+        dispatch_sync(dispatch_get_main_queue(), ^{
+            setupBlock();
+        });
+    }
+    else {
+        setupBlock();
+    }
+    return _sharedManager;
+}
+
++ (void) setMapboxMetricsEnabledSettingShownInApp:(BOOL)shown {
+    [MGLAccountManager sharedManager].mapboxMetricsEnabledSettingShownInApp = shown;
+}
+
++ (BOOL) mapboxMetricsEnabledSettingShownInApp {
+    return [MGLAccountManager sharedManager].mapboxMetricsEnabledSettingShownInApp;
+}
+
++ (void) setAccessToken:(NSString *) accessToken {
+    [[MGLAccountManager sharedManager] setAccessToken:accessToken];
+
+    // Update MGLMapboxEvents
+    // NOTE: This is (likely) the initial setup of MGLMapboxEvents
+    [MGLMapboxEvents sharedManager];
+}
+
++ (NSString *) accessToken {
+    return [MGLAccountManager sharedManager].accessToken;
+}
+
+
+@end
\ No newline at end of file
diff --git a/platform/ios/MGLFileCache.h b/platform/ios/MGLFileCache.h
new file mode 100644
index 000000000..5e9f37fe2
--- /dev/null
+++ b/platform/ios/MGLFileCache.h
@@ -0,0 +1,10 @@
+#import <Foundation/Foundation.h>
+
+#include <mbgl/storage/sqlite_cache.hpp>
+
+@interface MGLFileCache : NSObject
+
++ (mbgl::SQLiteCache *)obtainSharedCacheWithObject:(NSObject *)object;
++ (void)releaseSharedCacheForObject:(NSObject *)object;
+
+@end
diff --git a/platform/ios/MGLFileCache.mm b/platform/ios/MGLFileCache.mm
new file mode 100644
index 000000000..3303b395f
--- /dev/null
+++ b/platform/ios/MGLFileCache.mm
@@ -0,0 +1,83 @@
+#import "MGLFileCache.h"
+
+@interface MGLFileCache ()
+
+@property (nonatomic) MGLFileCache *sharedInstance;
+@property (nonatomic) mbgl::SQLiteCache *sharedCache;
+@property (nonatomic) NSHashTable *retainers;
+
+@end
+
+@implementation MGLFileCache
+
+const std::string &defaultCacheDatabasePath() {
+    static const std::string path = []() -> std::string {
+        NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
+        if ([paths count] == 0) {
+            // Disable the cache if we don't have a location to write.
+            return "";
+        }
+
+        NSString *libraryDirectory = [paths objectAtIndex:0];
+        return [[libraryDirectory stringByAppendingPathComponent:@"cache.db"] UTF8String];
+    }();
+    return path;
+}
+
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        _retainers = [NSHashTable weakObjectsHashTable];
+    }
+    return self;
+}
+
++ (instancetype)sharedInstance {
+    static dispatch_once_t onceToken;
+    static MGLFileCache *_sharedInstance;
+    dispatch_once(&onceToken, ^{
+        _sharedInstance = [[self alloc] init];
+    });
+    return _sharedInstance;
+}
+
+- (void)teardown {
+    if (self.sharedCache) {
+        delete self.sharedCache;
+        self.sharedCache = nullptr;
+    }
+}
+
+- (void)dealloc {
+    [self.retainers removeAllObjects];
+    [self teardown];
+}
+
++ (mbgl::SQLiteCache *)obtainSharedCacheWithObject:(NSObject *)object {
+    return [[MGLFileCache sharedInstance] obtainSharedCacheWithObject:object];
+}
+
+- (mbgl::SQLiteCache *)obtainSharedCacheWithObject:(NSObject *)object {
+    assert([[NSThread currentThread] isMainThread]);
+    if (!self.sharedCache) {
+        self.sharedCache = new mbgl::SQLiteCache(defaultCacheDatabasePath());
+    }
+    [self.retainers addObject:object];
+    return self.sharedCache;
+}
+
++ (void)releaseSharedCacheForObject:(NSObject *)object {
+    return [[MGLFileCache sharedInstance] releaseSharedCacheForObject:object];
+}
+
+- (void)releaseSharedCacheForObject:(NSObject *)object {
+    assert([[NSThread currentThread] isMainThread]);
+    if ([self.retainers containsObject:object]) {
+        [self.retainers removeObject:object];
+    }
+    if ([self.retainers count] == 0) {
+        [self teardown];
+    }
+}
+
+@end
diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm
index f9ed77041..5d1410751 100644
--- a/platform/ios/MGLMapView.mm
+++ b/platform/ios/MGLMapView.mm
@@ -11,39 +11,26 @@
 #include <mbgl/platform/platform.hpp>
 #include <mbgl/platform/darwin/reachability.h>
 #include <mbgl/storage/default_file_source.hpp>
-#include <mbgl/storage/sqlite_cache.hpp>
 #include <mbgl/storage/network_status.hpp>
 #include <mbgl/util/geo.hpp>
+#include <mbgl/util/constants.hpp>
 
-#import "MGLTypes.h"
+#import "MapboxGL.h"
+
+#import "NSBundle+MGLAdditions.h"
 #import "NSString+MGLAdditions.h"
 #import "NSProcessInfo+MGLAdditions.h"
-#import "MGLAnnotation.h"
+#import "NSException+MGLAdditions.h"
 #import "MGLUserLocationAnnotationView.h"
 #import "MGLUserLocation_Private.h"
+#import "MGLFileCache.h"
+#import "MGLMapboxEvents.h"
 
 #import "SMCalloutView.h"
 
-#import "MGLMapboxEvents.h"
-
 #import <algorithm>
 
-// Returns the path to the default cache database on this system.
-const std::string &defaultCacheDatabase() {
-    static const std::string path = []() -> std::string {
-        NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
-        if ([paths count] == 0) {
-            // Disable the cache if we don't have a location to write.
-            return "";
-        }
-
-        NSString *libraryDirectory = [paths objectAtIndex:0];
-        return [[libraryDirectory stringByAppendingPathComponent:@"cache.db"] UTF8String];
-    }();
-    return path;
-}
-
-static dispatch_once_t loadGLExtensions;
+class MBGLView;
 
 NSString *const MGLDefaultStyleName = @"mapbox-streets";
 NSString *const MGLStyleVersion = @"7";
@@ -63,7 +50,7 @@ static NSURL *MGLURLForBundledStyleNamed(NSString *styleName)
 
 #pragma mark - Private -
 
-@interface MGLMapView () <UIGestureRecognizerDelegate, GLKViewDelegate, CLLocationManagerDelegate>
+@interface MGLMapView () <UIGestureRecognizerDelegate, GLKViewDelegate, CLLocationManagerDelegate, UIActionSheetDelegate>
 
 @property (nonatomic) EAGLContext *context;
 @property (nonatomic) GLKView *glView;
@@ -72,6 +59,7 @@ static NSURL *MGLURLForBundledStyleNamed(NSString *styleName)
 @property (nonatomic) UIImageView *compass;
 @property (nonatomic) UIImageView *logoBug;
 @property (nonatomic) UIButton *attributionButton;
+@property (nonatomic) UIActionSheet *attributionSheet;
 @property (nonatomic) UIPanGestureRecognizer *pan;
 @property (nonatomic) UIPinchGestureRecognizer *pinch;
 @property (nonatomic) UIRotationGestureRecognizer *rotate;
@@ -87,6 +75,7 @@ static NSURL *MGLURLForBundledStyleNamed(NSString *styleName)
 @property (nonatomic) CGFloat scale;
 @property (nonatomic) CGFloat angle;
 @property (nonatomic) CGFloat quickZoomStart;
+@property (nonatomic, getter=isDormant) BOOL dormant;
 @property (nonatomic, getter=isAnimatingGesture) BOOL animatingGesture;
 @property (nonatomic, readonly, getter=isRotationAllowed) BOOL rotationAllowed;
 
@@ -94,6 +83,10 @@ static NSURL *MGLURLForBundledStyleNamed(NSString *styleName)
 
 @implementation MGLMapView
 {
+    mbgl::Map *_mbglMap;
+    MBGLView *_mbglView;
+    mbgl::DefaultFileSource *_mbglFileSource;
+
     BOOL _isTargetingInterfaceBuilder;
     CLLocationDegrees _pendingLatitude;
     CLLocationDegrees _pendingLongitude;
@@ -103,18 +96,11 @@ static NSURL *MGLURLForBundledStyleNamed(NSString *styleName)
 
 @dynamic debugActive;
 
-class MBGLView;
-
 std::chrono::steady_clock::duration secondsAsDuration(float duration)
 {
     return std::chrono::duration_cast<std::chrono::steady_clock::duration>(std::chrono::duration<float, std::chrono::seconds::period>(duration));
 }
 
-mbgl::Map *mbglMap = nullptr;
-MBGLView *mbglView = nullptr;
-mbgl::SQLiteCache *mbglFileCache = nullptr;
-mbgl::DefaultFileSource *mbglFileSource = nullptr;
-
 - (instancetype)initWithFrame:(CGRect)frame
 {
     self = [super initWithFrame:frame];
@@ -122,6 +108,7 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
     if (self && [self commonInit])
     {
         self.styleURL = nil;
+        self.accessToken = [MGLAccountManager accessToken];
         return self;
     }
 
@@ -161,13 +148,13 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
 
 - (NSString *)accessToken
 {
-    return @(mbglMap->getAccessToken().c_str()).mgl_stringOrNilIfEmpty;
+    return @(_mbglMap->getAccessToken().c_str()).mgl_stringOrNilIfEmpty;
 }
 
 - (void)setAccessToken:(NSString *)accessToken
 {
-    mbglMap->setAccessToken(accessToken ? (std::string)[accessToken UTF8String] : "");
-    [MGLMapboxEvents setToken:accessToken.mgl_stringOrNilIfEmpty];
+    _mbglMap->setAccessToken(accessToken ? (std::string)[accessToken UTF8String] : "");
+    [MGLAccountManager setAccessToken:accessToken.mgl_stringOrNilIfEmpty];
 }
 
 + (NSSet *)keyPathsForValuesAffectingStyleURL
@@ -177,34 +164,34 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
 
 - (NSURL *)styleURL
 {
-    NSString *styleURLString = @(mbglMap->getStyleURL().c_str()).mgl_stringOrNilIfEmpty;
+    NSString *styleURLString = @(_mbglMap->getStyleURL().c_str()).mgl_stringOrNilIfEmpty;
     return styleURLString ? [NSURL URLWithString:styleURLString] : nil;
 }
 
 - (void)setStyleURL:(NSURL *)styleURL
 {
     if (_isTargetingInterfaceBuilder) return;
-    
+
     if ( ! styleURL)
     {
         styleURL = MGLURLForBundledStyleNamed([NSString stringWithFormat:@"%@-v%@",
                                                MGLDefaultStyleName.lowercaseString,
                                                MGLStyleVersion]);
     }
-    
+
     if ( ! [styleURL scheme])
     {
         // Assume a relative path into the developer’s bundle.
         styleURL = [[NSBundle mainBundle] URLForResource:styleURL.path withExtension:nil];
     }
-    
-    mbglMap->setStyleURL([[styleURL absoluteString] UTF8String]);
+
+    _mbglMap->setStyleURL([[styleURL absoluteString] UTF8String]);
 }
 
 - (BOOL)commonInit
 {
     _isTargetingInterfaceBuilder = NSProcessInfo.processInfo.mgl_isInterfaceBuilderDesignablesAgent;
-    
+
     // create context
     //
     _context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];
@@ -219,12 +206,6 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
     // setup accessibility
     //
     self.accessibilityLabel = @"Map";
-    
-    // metrics: initial setup
-    NSString *appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"];
-    NSString *appVersion = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
-    if (appName != nil) [MGLMapboxEvents setAppName:appName];
-    if (appVersion != nil) [MGLMapboxEvents setAppVersion:appVersion];
 
     // create GL view
     //
@@ -241,41 +222,36 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
     [self insertSubview:_glView atIndex:0];
 
     _glView.contentMode = UIViewContentModeCenter;
-    
+
     self.backgroundColor = [UIColor clearColor];
     self.clipsToBounds = YES;
 
     // load extensions
     //
-    dispatch_once(&loadGLExtensions, ^
-    {
-        const std::string extensions = (char *)glGetString(GL_EXTENSIONS);
-
-        using namespace mbgl;
-
-        if (extensions.find("GL_OES_vertex_array_object") != std::string::npos) {
-            gl::BindVertexArray = glBindVertexArrayOES;
-            gl::DeleteVertexArrays = glDeleteVertexArraysOES;
-            gl::GenVertexArrays = glGenVertexArraysOES;
-            gl::IsVertexArray = glIsVertexArrayOES;
+    mbgl::gl::InitializeExtensions([](const char * name) {
+        static CFBundleRef framework = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.opengles"));
+        if (!framework) {
+            throw std::runtime_error("Failed to load OpenGL framework.");
         }
 
-        if (extensions.find("GL_OES_packed_depth_stencil") != std::string::npos) {
-            gl::isPackedDepthStencilSupported = YES;
-        }
+        CFStringRef str = CFStringCreateWithCString(kCFAllocatorDefault, name, kCFStringEncodingASCII);
+        void* symbol = CFBundleGetFunctionPointerForName(framework, str);
+        CFRelease(str);
 
-        if (extensions.find("GL_OES_depth24") != std::string::npos) {
-            gl::isDepth24Supported = YES;
-        }
+        return reinterpret_cast<mbgl::gl::glProc>(symbol);
     });
 
     // setup mbgl map
     //
-    mbglView = new MBGLView(self);
-    mbglFileCache  = new mbgl::SQLiteCache(defaultCacheDatabase());
-    mbglFileSource = new mbgl::DefaultFileSource(mbglFileCache);
-    mbglMap = new mbgl::Map(*mbglView, *mbglFileSource);
-    mbglView->resize(self.bounds.size.width, self.bounds.size.height, _glView.contentScaleFactor, _glView.drawableWidth, _glView.drawableHeight);
+    _mbglView = new MBGLView(self);
+    _mbglFileSource = new mbgl::DefaultFileSource([MGLFileCache obtainSharedCacheWithObject:self]);
+
+    // Start paused on the IB canvas
+    _mbglMap = new mbgl::Map(*_mbglView, *_mbglFileSource, mbgl::MapMode::Continuous);
+    if (_isTargetingInterfaceBuilder) {
+        _mbglMap->pause();
+    }
+    _mbglMap->resize(self.bounds.size.width, self.bounds.size.height, _glView.contentScaleFactor);
 
     // Notify map object when network reachability status changes.
     [[NSNotificationCenter defaultCenter] addObserver:self
@@ -290,7 +266,7 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
     //
     _annotationIDsByAnnotation = [NSMapTable mapTableWithKeyOptions:NSMapTableStrongMemory valueOptions:NSMapTableStrongMemory];
     std::string defaultSymbolName([MGLDefaultStyleMarkerSymbolName UTF8String]);
-    mbglMap->setDefaultPointAnnotationSymbol(defaultSymbolName);
+    _mbglMap->setDefaultPointAnnotationSymbol(defaultSymbolName);
 
     // setup logo bug
     //
@@ -304,9 +280,19 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
     //
     _attributionButton = [UIButton buttonWithType:UIButtonTypeInfoLight];
     _attributionButton.accessibilityLabel = @"Attribution info";
-    [_attributionButton addTarget:self action:@selector(showAttribution:) forControlEvents:UIControlEventTouchUpInside];
+    [_attributionButton addTarget:self action:@selector(showAttribution) forControlEvents:UIControlEventTouchUpInside];
     _attributionButton.translatesAutoresizingMaskIntoConstraints = NO;
     [self addSubview:_attributionButton];
+    
+    _attributionSheet = [[UIActionSheet alloc] initWithTitle:@"Mapbox GL for iOS"
+                                                    delegate:self
+                                           cancelButtonTitle:@"Cancel"
+                                      destructiveButtonTitle:nil
+                                           otherButtonTitles:
+                         @"© Mapbox",
+                         @"© OpenStreetMap",
+                         @"Improve This Map",
+                         nil];
 
     // setup compass
     //
@@ -321,12 +307,11 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
     [container addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleCompassTapGesture:)]];
     [self addSubview:container];
 
-    self.viewControllerForLayoutGuides = nil;
-
     // setup interaction
     //
     _pan = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(handlePanGesture:)];
     _pan.delegate = self;
+    _pan.maximumNumberOfTouches = 1;
     [self addGestureRecognizer:_pan];
     _scrollEnabled = YES;
 
@@ -364,13 +349,15 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
 
     // observe app activity
     //
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(appDidBackground:) name:UIApplicationDidEnterBackgroundNotification object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(appWillForeground:) name:UIApplicationWillEnterForegroundNotification object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(sleepGL:) name:UIApplicationWillResignActiveNotification object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(sleepGL:) name:UIApplicationDidEnterBackgroundNotification object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(wakeGL:) name:UIApplicationWillEnterForegroundNotification object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(wakeGL:) name:UIApplicationDidBecomeActiveNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didReceiveMemoryWarning) name:UIApplicationDidReceiveMemoryWarningNotification object:nil];
 
     // set initial position
     //
-    mbglMap->setLatLngZoom(mbgl::LatLng(0, 0), mbglMap->getMinZoom());
+    _mbglMap->setLatLngZoom(mbgl::LatLng(0, 0), _mbglMap->getMinZoom());
     _pendingLatitude = NAN;
     _pendingLongitude = NAN;
 
@@ -379,15 +366,9 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
     _regionChangeDelegateQueue = [NSOperationQueue new];
     _regionChangeDelegateQueue.maxConcurrentOperationCount = 1;
 
-    // start the main loop, but not on the IB canvas
-    if ( ! _isTargetingInterfaceBuilder)
-    {
-        mbglMap->start();
-    }
-
     // metrics: map load event
-    const mbgl::LatLng latLng = mbglMap->getLatLng();
-    const double zoom = mbglMap->getZoom();
+    const mbgl::LatLng latLng = _mbglMap->getLatLng();
+    const double zoom = _mbglMap->getZoom();
 
     [MGLMapboxEvents pushEvent:MGLEventTypeMapLoad withAttributes:@{
         MGLEventKeyLatitude: @(latLng.latitude),
@@ -413,22 +394,24 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
 
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 
-    if (mbglMap)
+    if (_mbglMap)
     {
-        delete mbglMap;
-        mbglMap = nullptr;
+        delete _mbglMap;
+        _mbglMap = nullptr;
     }
 
-    if (mbglFileSource)
+    if (_mbglFileSource)
     {
-        delete mbglFileSource;
-        mbglFileSource = nullptr;
+        delete _mbglFileSource;
+        _mbglFileSource = nullptr;
     }
 
-    if (mbglView)
+    [MGLFileCache releaseSharedCacheForObject:self];
+
+    if (_mbglView)
     {
-        delete mbglView;
-        mbglView = nullptr;
+        delete _mbglView;
+        _mbglView = nullptr;
     }
 
     if ([[EAGLContext currentContext] isEqual:_context])
@@ -440,7 +423,7 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
 - (void)setDelegate:(id<MGLMapViewDelegate>)delegate
 {
     if (_delegate == delegate) return;
-    
+
     _delegate = delegate;
 }
 
@@ -474,15 +457,22 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
     [self setNeedsUpdateConstraints];
 }
 
-- (void)setViewControllerForLayoutGuides:(UIViewController *)viewController
+- (UIViewController *)viewControllerForLayoutGuides
 {
-    _viewControllerForLayoutGuides = viewController;
-
-    [self.compass.superview removeConstraints:self.compass.superview.constraints];
-    [self.logoBug removeConstraints:self.logoBug.constraints];
-    [self.attributionButton removeConstraints:self.attributionButton.constraints];
-
-    [self setNeedsUpdateConstraints];
+    // Per -[UIResponder nextResponder] documentation, a UIView’s next responder
+    // is its managing UIViewController if applicable, or otherwise its
+    // superview. UIWindow’s next responder is UIApplication, which has no next
+    // responder.
+    UIResponder *laterResponder = self;
+    while ([laterResponder isKindOfClass:[UIView class]])
+    {
+        laterResponder = laterResponder.nextResponder;
+    }
+    if ([laterResponder isKindOfClass:[UIViewController class]])
+    {
+        return (UIViewController *)laterResponder;
+    }
+    return nil;
 }
 
 - (void)updateConstraints
@@ -491,21 +481,20 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
     // views so they don't underlap navigation or tool bars. If we don't have a reference, apply
     // constraints against ourself to maintain (albeit less ideal) placement of the subviews.
     //
-    UIView *constraintParentView = (self.viewControllerForLayoutGuides.view ?
-                                    self.viewControllerForLayoutGuides.view :
-                                    self);
+    UIViewController *viewController = self.viewControllerForLayoutGuides;
+    UIView *constraintParentView = (viewController.view ? viewController.view : self);
 
     // compass
     //
     UIView *compassContainer = self.compass.superview;
 
-    if (self.viewControllerForLayoutGuides)
+    if (viewController)
     {
         [constraintParentView addConstraint:
          [NSLayoutConstraint constraintWithItem:compassContainer
                                       attribute:NSLayoutAttributeTop
                                       relatedBy:NSLayoutRelationGreaterThanOrEqual
-                                         toItem:self.viewControllerForLayoutGuides.topLayoutGuide
+                                         toItem:viewController.topLayoutGuide
                                       attribute:NSLayoutAttributeBottom
                                      multiplier:1
                                        constant:5]];
@@ -548,10 +537,10 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
 
     // logo bug
     //
-    if (self.viewControllerForLayoutGuides)
+    if (viewController)
     {
         [constraintParentView addConstraint:
-         [NSLayoutConstraint constraintWithItem:self.viewControllerForLayoutGuides.bottomLayoutGuide
+         [NSLayoutConstraint constraintWithItem:viewController.bottomLayoutGuide
                                       attribute:NSLayoutAttributeTop
                                       relatedBy:NSLayoutRelationGreaterThanOrEqual
                                          toItem:self.logoBug
@@ -579,10 +568,10 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
 
     // attribution button
     //
-    if (self.viewControllerForLayoutGuides)
+    if (viewController)
     {
         [constraintParentView addConstraint:
-         [NSLayoutConstraint constraintWithItem:self.viewControllerForLayoutGuides.bottomLayoutGuide
+         [NSLayoutConstraint constraintWithItem:viewController.bottomLayoutGuide
                                       attribute:NSLayoutAttributeTop
                                       relatedBy:NSLayoutRelationGreaterThanOrEqual
                                          toItem:self.attributionButton
@@ -614,21 +603,25 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
 // This is the delegate of the GLKView object's display call.
 - (void)glkView:(GLKView *)view drawInRect:(CGRect)rect
 {
-    if ( ! self.glSnapshotView || self.glSnapshotView.hidden)
+    if ( ! self.isDormant)
     {
-        mbglView->resize(rect.size.width, rect.size.height, view.contentScaleFactor, view.drawableWidth, view.drawableHeight);
+        [self notifyMapChange:@(mbgl::MapChangeWillStartRenderingMap)];
 
-        CGFloat zoomFactor   = mbglMap->getMaxZoom() - mbglMap->getMinZoom() + 1;
+        _mbglMap->resize(rect.size.width, rect.size.height, view.contentScaleFactor);
+
+        CGFloat zoomFactor   = _mbglMap->getMaxZoom() - _mbglMap->getMinZoom() + 1;
         CGFloat cpuFactor    = (CGFloat)[[NSProcessInfo processInfo] processorCount];
         CGFloat memoryFactor = (CGFloat)[[NSProcessInfo processInfo] physicalMemory] / 1000 / 1000 / 1000;
-        CGFloat sizeFactor   = ((CGFloat)mbglMap->getState().getWidth()  / mbgl::util::tileSize) *
-                               ((CGFloat)mbglMap->getState().getHeight() / mbgl::util::tileSize);
+        CGFloat sizeFactor   = ((CGFloat)_mbglMap->getWidth()  / mbgl::util::tileSize) *
+                               ((CGFloat)_mbglMap->getHeight() / mbgl::util::tileSize);
 
         NSUInteger cacheSize = zoomFactor * cpuFactor * memoryFactor * sizeFactor * 0.5;
 
-        mbglMap->setSourceTileCacheSize(cacheSize);
+        _mbglMap->setSourceTileCacheSize(cacheSize);
 
-        mbglMap->renderSync();
+        _mbglMap->renderSync();
+
+        [self notifyMapChange:@(mbgl::MapChangeDidFinishRenderingMap)];
     }
 }
 
@@ -636,44 +629,78 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
 - (void)layoutSubviews
 {
     [super layoutSubviews];
-    
+
     if ( ! _isTargetingInterfaceBuilder)
     {
-        mbglMap->triggerUpdate();
+        _mbglMap->update();
+    }
+    
+    if (self.attributionSheet.visible)
+    {
+        [self.attributionSheet dismissWithClickedButtonIndex:self.attributionSheet.cancelButtonIndex animated:YES];
+    }
+
+    if (self.compass.alpha)
+    {
+        [self updateHeadingForDeviceOrientation];
+        [self updateCompass];
     }
 }
 
 #pragma mark - Life Cycle -
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-parameter"
-
-- (void)appDidBackground:(NSNotification *)notification
+- (void)sleepGL:(__unused NSNotification *)notification
 {
-    [MGLMapboxEvents flush];
+    MGLAssertIsMainThread();
 
-    if ( ! self.glSnapshotView)
+    if ( ! self.isDormant)
     {
-        self.glSnapshotView = [[UIImageView alloc] initWithFrame:self.glView.frame];
-        self.glSnapshotView.autoresizingMask = self.glView.autoresizingMask;
-        [self insertSubview:self.glSnapshotView aboveSubview:self.glView];
+        self.dormant = YES;
+
+        [MGLMapboxEvents flush];
+
+        if ( ! self.glSnapshotView)
+        {
+            self.glSnapshotView = [[UIImageView alloc] initWithFrame:self.glView.frame];
+            self.glSnapshotView.autoresizingMask = self.glView.autoresizingMask;
+            [self insertSubview:self.glSnapshotView aboveSubview:self.glView];
+        }
+
+        self.glSnapshotView.image = self.glView.snapshot;
+        self.glSnapshotView.hidden = NO;
+
+        if (_mbglMap->getDebug() && [self.glSnapshotView.subviews count] == 0)
+        {
+            UIView *snapshotTint = [[UIView alloc] initWithFrame:self.glSnapshotView.bounds];
+            snapshotTint.autoresizingMask = self.glSnapshotView.autoresizingMask;
+            snapshotTint.backgroundColor = [[UIColor redColor] colorWithAlphaComponent:0.25];
+            [self.glSnapshotView addSubview:snapshotTint];
+        }
+
+        _mbglMap->pause();
+
+        [self.glView deleteDrawable];
     }
-
-    self.glSnapshotView.image = self.glView.snapshot;
-    self.glSnapshotView.hidden = NO;
-
-    mbglMap->stop();
-
-    [self.glView deleteDrawable];
 }
 
-- (void)appWillForeground:(NSNotification *)notification
+- (void)wakeGL:(__unused NSNotification *)notification
 {
-    self.glSnapshotView.hidden = YES;
+    MGLAssertIsMainThread();
 
-    [self.glView bindDrawable];
+    if (self.isDormant)
+    {
+        self.dormant = NO;
+        
+        [MGLMapboxEvents validate];
 
-    mbglMap->start();
+        self.glSnapshotView.hidden = YES;
+
+        [self.glSnapshotView.subviews makeObjectsPerformSelector:@selector(removeFromSuperview)];
+
+        [self.glView bindDrawable];
+
+        _mbglMap->resume();
+    }
 }
 
 - (void)tintColorDidChange
@@ -690,26 +717,31 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
 
 #pragma mark - Gestures -
 
-- (void)handleCompassTapGesture:(id)sender
+- (void)handleCompassTapGesture:(__unused id)sender
 {
     [self resetNorthAnimated:YES];
 
     if (self.userTrackingMode == MGLUserTrackingModeFollowWithHeading) self.userTrackingMode = MGLUserTrackingModeFollow;
 }
 
-#pragma clang diagnostic pop
+- (void)touchesBegan:(__unused NSSet *)touches withEvent:(__unused UIEvent *)event
+{
+    _mbglMap->cancelTransitions();
+    _mbglMap->setGestureInProgress(false);
+    self.animatingGesture = NO;
+}
 
 - (void)handlePanGesture:(UIPanGestureRecognizer *)pan
 {
     if ( ! self.isScrollEnabled) return;
 
-    mbglMap->cancelTransitions();
+    _mbglMap->cancelTransitions();
 
     if (pan.state == UIGestureRecognizerStateBegan)
     {
         [self trackGestureEvent:MGLEventGesturePanStart forRecognizer:pan];
 
-        mbglMap->setGestureInProgress(true);
+        _mbglMap->setGestureInProgress(true);
 
         self.centerPoint = CGPointMake(0, 0);
 
@@ -720,36 +752,31 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
         CGPoint delta = CGPointMake([pan translationInView:pan.view].x - self.centerPoint.x,
                                     [pan translationInView:pan.view].y - self.centerPoint.y);
 
-        mbglMap->moveBy(delta.x, delta.y);
+        _mbglMap->moveBy(delta.x, delta.y);
 
         self.centerPoint = CGPointMake(self.centerPoint.x + delta.x, self.centerPoint.y + delta.y);
-        
+
         [self notifyMapChange:@(mbgl::MapChangeRegionDidChangeAnimated)];
     }
     else if (pan.state == UIGestureRecognizerStateEnded || pan.state == UIGestureRecognizerStateCancelled)
     {
         CGPoint velocity = [pan velocityInView:pan.view];
-        CGFloat duration = 0;
-
-        if ( ! CGPointEqualToPoint(velocity, CGPointZero))
+        if (sqrtf(velocity.x * velocity.x + velocity.y * velocity.y) < 100)
         {
-            CGFloat ease = 0.25;
-
-            velocity.x = velocity.x * ease;
-            velocity.y = velocity.y * ease;
-
-            CGFloat speed = sqrt(velocity.x * velocity.x + velocity.y * velocity.y);
-            CGFloat deceleration = 2500;
-            duration = speed / (deceleration * ease);
+            // Not enough velocity to overcome friction
+            velocity = CGPointZero;
         }
 
-        CGPoint offset = CGPointMake(velocity.x * duration / 2, velocity.y * duration / 2);
+        CGFloat duration = UIScrollViewDecelerationRateNormal;
+        if ( ! CGPointEqualToPoint(velocity, CGPointZero))
+        {
+            CGPoint offset = CGPointMake(velocity.x * duration / 4, velocity.y * duration / 4);
+            _mbglMap->moveBy(offset.x, offset.y, secondsAsDuration(duration));
+        }
 
-        mbglMap->moveBy(offset.x, offset.y, secondsAsDuration(duration));
+        _mbglMap->setGestureInProgress(false);
 
-        mbglMap->setGestureInProgress(false);
-
-        if (duration)
+        if ( ! CGPointEqualToPoint(velocity, CGPointZero))
         {
             self.animatingGesture = YES;
 
@@ -784,17 +811,17 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
 {
     if ( ! self.isZoomEnabled) return;
 
-    if (mbglMap->getZoom() <= mbglMap->getMinZoom() && pinch.scale < 1) return;
+    if (_mbglMap->getZoom() <= _mbglMap->getMinZoom() && pinch.scale < 1) return;
 
-    mbglMap->cancelTransitions();
+    _mbglMap->cancelTransitions();
 
     if (pinch.state == UIGestureRecognizerStateBegan)
     {
         [self trackGestureEvent:MGLEventGesturePinchStart forRecognizer:pinch];
 
-        mbglMap->setGestureInProgress(true);
+        _mbglMap->setGestureInProgress(true);
 
-        self.scale = mbglMap->getScale();
+        self.scale = _mbglMap->getScale();
 
         self.userTrackingMode = MGLUserTrackingModeNone;
     }
@@ -802,19 +829,67 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
     {
         CGFloat newScale = self.scale * pinch.scale;
 
-        if (log2(newScale) < mbglMap->getMinZoom()) return;
+        if (log2(newScale) < _mbglMap->getMinZoom()) return;
 
-        double scale = mbglMap->getScale();
-
-        mbglMap->scaleBy(newScale / scale, [pinch locationInView:pinch.view].x, [pinch locationInView:pinch.view].y);
+        _mbglMap->setScale(newScale, [pinch locationInView:pinch.view].x, [pinch locationInView:pinch.view].y);
     }
     else if (pinch.state == UIGestureRecognizerStateEnded || pinch.state == UIGestureRecognizerStateCancelled)
     {
-        mbglMap->setGestureInProgress(false);
+        CGFloat velocity = pinch.velocity;
+        if (isnan(velocity))
+        {
+            // UIPinchGestureRecognizer sometimes returns NaN for the velocity
+            velocity = 0;
+        }
+        if (velocity > -0.5 && velocity < 3)
+        {
+            velocity = 0;
+        }
+        CGFloat duration = velocity > 0 ? 1 : 0.25;
+
+        CGFloat scale = self.scale * pinch.scale;
+        CGFloat newScale = scale;
+        if (velocity >= 0)
+        {
+            newScale += scale * velocity * duration * 0.1;
+        }
+        else
+        {
+            newScale += scale / (velocity * duration) * 0.1;
+        }
+
+        if (newScale <= 0 || log2(newScale) < _mbglMap->getMinZoom())
+        {
+            velocity = 0;
+        }
+
+        if (velocity)
+        {
+            CGPoint pinchCenter = [pinch locationInView:pinch.view];
+            _mbglMap->setScale(newScale, pinchCenter.x, pinchCenter.y, secondsAsDuration(duration));
+        }
+
+        _mbglMap->setGestureInProgress(false);
 
         [self unrotateIfNeededAnimated:YES];
 
-        [self notifyMapChange:@(mbgl::MapChangeRegionDidChange)];
+        if (velocity)
+        {
+            self.animatingGesture = YES;
+
+            __weak MGLMapView *weakSelf = self;
+
+            [self animateWithDelay:duration animations:^
+            {
+                weakSelf.animatingGesture = NO;
+
+                [weakSelf notifyMapChange:@(mbgl::MapChangeRegionDidChangeAnimated)];
+            }];
+        }
+        else
+        {
+            [self notifyMapChange:@(mbgl::MapChangeRegionDidChange)];
+        }
     }
 }
 
@@ -822,15 +897,15 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
 {
     if ( ! self.isRotateEnabled) return;
 
-    mbglMap->cancelTransitions();
+    _mbglMap->cancelTransitions();
 
     if (rotate.state == UIGestureRecognizerStateBegan)
     {
         [self trackGestureEvent:MGLEventGestureRotateStart forRecognizer:rotate];
 
-        mbglMap->setGestureInProgress(true);
+        _mbglMap->setGestureInProgress(true);
 
-        self.angle = [MGLMapView degreesToRadians:mbglMap->getBearing()] * -1;
+        self.angle = [MGLMapView degreesToRadians:_mbglMap->getBearing()] * -1;
 
         self.userTrackingMode = MGLUserTrackingModeNone;
     }
@@ -846,17 +921,46 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
             newDegrees = fmaxf(newDegrees, -30);
         }
 
-        mbglMap->setBearing(newDegrees,
+        _mbglMap->setBearing(newDegrees,
                             [rotate locationInView:rotate.view].x,
                             [rotate locationInView:rotate.view].y);
     }
     else if (rotate.state == UIGestureRecognizerStateEnded || rotate.state == UIGestureRecognizerStateCancelled)
     {
-        mbglMap->setGestureInProgress(false);
+        CGFloat velocity = rotate.velocity;
 
-        [self unrotateIfNeededAnimated:YES];
+        if (fabs(velocity) > 3)
+        {
+            CGFloat radians = self.angle + rotate.rotation;
+            CGFloat duration = UIScrollViewDecelerationRateNormal;
+            CGFloat newRadians = radians + velocity * duration * 0.1;
+            CGFloat newDegrees = [MGLMapView radiansToDegrees:newRadians] * -1;
 
-        [self notifyMapChange:@(mbgl::MapChangeRegionDidChange)];
+            _mbglMap->setBearing(newDegrees, secondsAsDuration(duration));
+
+            _mbglMap->setGestureInProgress(false);
+
+            self.animatingGesture = YES;
+
+            __weak MGLMapView *weakSelf = self;
+
+            [self animateWithDelay:duration animations:^
+             {
+                 weakSelf.animatingGesture = NO;
+
+                 [weakSelf unrotateIfNeededAnimated:YES];
+
+                 [weakSelf notifyMapChange:@(mbgl::MapChangeRegionDidChangeAnimated)];
+             }];
+        }
+        else
+        {
+            _mbglMap->setGestureInProgress(false);
+
+            [self unrotateIfNeededAnimated:YES];
+
+            [self notifyMapChange:@(mbgl::MapChangeRegionDidChange)];
+        }
     }
 }
 
@@ -907,7 +1011,7 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
         tapBounds.extend(coordinateToLatLng(coordinate));
 
         // query for nearby annotations
-        std::vector<uint32_t> nearbyAnnotations = mbglMap->getAnnotationsInBounds(tapBounds);
+        std::vector<uint32_t> nearbyAnnotations = _mbglMap->getAnnotationsInBounds(tapBounds);
 
         int32_t newSelectedAnnotationID = -1;
 
@@ -990,7 +1094,7 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
 {
     if ( ! self.isZoomEnabled) return;
 
-    mbglMap->cancelTransitions();
+    _mbglMap->cancelTransitions();
 
     if (doubleTap.state == UIGestureRecognizerStateBegan)
     {
@@ -1000,25 +1104,22 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
     {
         CGPoint doubleTapPoint = [doubleTap locationInView:doubleTap.view];
 
-        CGPoint zoomInPoint;
-
+        CGPoint zoomInPoint = doubleTapPoint;
+        CGPoint userPoint = [self convertCoordinate:self.userLocation.coordinate toPointToView:self];
         if (self.userTrackingMode != MGLUserTrackingModeNone)
         {
-            CGPoint userPoint = [self convertCoordinate:self.userLocation.coordinate toPointToView:self];
             CGRect userLocationRect = CGRectMake(userPoint.x - 40, userPoint.y - 40, 80, 80);
             if (CGRectContainsPoint(userLocationRect, doubleTapPoint))
             {
                 zoomInPoint = userPoint;
             }
         }
-        else
+        if ( ! CGPointEqualToPoint(zoomInPoint, userPoint))
         {
             self.userTrackingMode = MGLUserTrackingModeNone;
-
-            zoomInPoint = doubleTapPoint;
         }
 
-        mbglMap->scaleBy(2, zoomInPoint.x, zoomInPoint.y, secondsAsDuration(MGLAnimationDuration));
+        _mbglMap->scaleBy(2, zoomInPoint.x, zoomInPoint.y, secondsAsDuration(MGLAnimationDuration));
 
         self.animatingGesture = YES;
 
@@ -1039,9 +1140,9 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
 {
     if ( ! self.isZoomEnabled) return;
 
-    if (mbglMap->getZoom() == mbglMap->getMinZoom()) return;
+    if (_mbglMap->getZoom() == _mbglMap->getMinZoom()) return;
 
-    mbglMap->cancelTransitions();
+    _mbglMap->cancelTransitions();
 
     if (twoFingerTap.state == UIGestureRecognizerStateBegan)
     {
@@ -1062,7 +1163,7 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
             zoomOutPoint = CGPointMake([twoFingerTap locationInView:twoFingerTap.view].x, [twoFingerTap locationInView:twoFingerTap.view].y);
         }
 
-        mbglMap->scaleBy(0.5, zoomOutPoint.x, zoomOutPoint.y, secondsAsDuration(MGLAnimationDuration));
+        _mbglMap->scaleBy(0.5, zoomOutPoint.x, zoomOutPoint.y, secondsAsDuration(MGLAnimationDuration));
 
         self.animatingGesture = YES;
 
@@ -1083,13 +1184,13 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
 {
     if ( ! self.isZoomEnabled) return;
 
-    mbglMap->cancelTransitions();
+    _mbglMap->cancelTransitions();
 
     if (quickZoom.state == UIGestureRecognizerStateBegan)
     {
         [self trackGestureEvent:MGLEventGestureQuickZoom forRecognizer:quickZoom];
 
-        self.scale = mbglMap->getScale();
+        self.scale = _mbglMap->getScale();
 
         self.quickZoomStart = [quickZoom locationInView:quickZoom.view].y;
 
@@ -1101,9 +1202,9 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
 
         CGFloat newZoom = log2f(self.scale) + (distance / 100);
 
-        if (newZoom < mbglMap->getMinZoom()) return;
+        if (newZoom < _mbglMap->getMinZoom()) return;
 
-        mbglMap->scaleBy(powf(2, newZoom) / mbglMap->getScale(), self.bounds.size.width / 2, self.bounds.size.height / 2);
+        _mbglMap->scaleBy(powf(2, newZoom) / _mbglMap->getScale(), self.bounds.size.width / 2, self.bounds.size.height / 2);
     }
     else if (quickZoom.state == UIGestureRecognizerStateEnded || quickZoom.state == UIGestureRecognizerStateCancelled)
     {
@@ -1143,6 +1244,34 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
     }];
 }
 
+#pragma mark - Attribution -
+
+- (void)showAttribution
+{
+    [self.attributionSheet showFromRect:self.attributionButton.frame inView:self animated:YES];
+}
+
+- (void)actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger)buttonIndex
+{
+    if (buttonIndex == actionSheet.firstOtherButtonIndex)
+    {
+        [[UIApplication sharedApplication] openURL:
+         [NSURL URLWithString:@"https://www.mapbox.com/about/maps/"]];
+    }
+    else if (buttonIndex == actionSheet.firstOtherButtonIndex + 1)
+    {
+        [[UIApplication sharedApplication] openURL:
+         [NSURL URLWithString:@"http://www.openstreetmap.org/about/"]];
+    }
+    else if (buttonIndex == actionSheet.firstOtherButtonIndex + 2)
+    {
+        NSString *feedbackURL = [NSString stringWithFormat:@"https://www.mapbox.com/map-feedback/#/%.5f/%.5f/%i",
+                                 self.longitude, self.latitude, (int)round(self.zoomLevel)];
+        [[UIApplication sharedApplication] openURL:
+         [NSURL URLWithString:feedbackURL]];
+    }
+}
+
 #pragma mark - Properties -
 
 + (NSSet *)keyPathsForValuesAffectingZoomEnabled
@@ -1160,24 +1289,14 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
     return [NSSet setWithObject:@"allowsRotating"];
 }
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-parameter"
-
-- (void)showAttribution:(id)sender
-{
-    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"https://www.mapbox.com/about/maps/"]];
-}
-
-#pragma clang diagnostic pop
-
 - (void)setDebugActive:(BOOL)debugActive
 {
-    mbglMap->setDebug(debugActive);
+    _mbglMap->setDebug(debugActive);
 }
 
 - (BOOL)isDebugActive
 {
-    return mbglMap->getDebug();
+    return _mbglMap->getDebug();
 }
 
 - (void)resetNorth
@@ -1191,7 +1310,7 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
 
     CGFloat duration = (animated ? MGLAnimationDuration : 0);
 
-    mbglMap->setBearing(0, secondsAsDuration(duration));
+    _mbglMap->setBearing(0, secondsAsDuration(duration));
 
     [UIView animateWithDuration:duration
                      animations:^
@@ -1209,19 +1328,19 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
 
 - (void)resetPosition
 {
-    mbglMap->resetPosition();
+    _mbglMap->resetPosition();
 
     [self notifyMapChange:@(mbgl::MapChangeRegionDidChange)];
 }
 
 - (void)toggleDebug
 {
-    mbglMap->toggleDebug();
+    _mbglMap->toggleDebug();
 }
 
 - (void)emptyMemoryCache
 {
-    mbglMap->onLowMemory();
+    _mbglMap->onLowMemory();
 }
 
 #pragma mark - Geography -
@@ -1242,9 +1361,9 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
 {
     CGFloat duration = (animated ? MGLAnimationDuration : 0);
 
-    mbglMap->setLatLngZoom(coordinateToLatLng(coordinate),
-                           fmaxf(mbglMap->getZoom(), self.currentMinimumZoom),
-                           secondsAsDuration(duration));
+    _mbglMap->setLatLngZoom(coordinateToLatLng(coordinate),
+                            fmaxf(_mbglMap->getZoom(), self.currentMinimumZoom),
+                            secondsAsDuration(duration));
 
     [self notifyMapChange:@(animated ? mbgl::MapChangeRegionDidChangeAnimated : mbgl::MapChangeRegionDidChange)];
 }
@@ -1256,7 +1375,7 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
 
 - (CLLocationCoordinate2D)centerCoordinate
 {
-    return latLngToCoordinate(mbglMap->getLatLng());
+    return latLngToCoordinate(_mbglMap->getLatLng());
 }
 
 - (void)setCenterCoordinate:(CLLocationCoordinate2D)centerCoordinate zoomLevel:(double)zoomLevel animated:(BOOL)animated
@@ -1265,7 +1384,7 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
 
     CGFloat duration = (animated ? MGLAnimationDuration : 0);
 
-    mbglMap->setLatLngZoom(coordinateToLatLng(centerCoordinate), zoomLevel, secondsAsDuration(duration));
+    _mbglMap->setLatLngZoom(coordinateToLatLng(centerCoordinate), zoomLevel, secondsAsDuration(duration));
 
     [self unrotateIfNeededAnimated:animated];
 
@@ -1274,7 +1393,7 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
 
 - (double)zoomLevel
 {
-    return mbglMap->getZoom();
+    return _mbglMap->getZoom();
 }
 
 - (void)setZoomLevel:(double)zoomLevel animated:(BOOL)animated
@@ -1283,7 +1402,7 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
 
     CGFloat duration = (animated ? MGLAnimationDuration : 0);
 
-    mbglMap->setLatLngZoom(mbglMap->getLatLng(),
+    _mbglMap->setLatLngZoom(_mbglMap->getLatLng(),
                            fmaxf(zoomLevel, self.currentMinimumZoom),
                            secondsAsDuration(duration));
 
@@ -1302,20 +1421,20 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
     // NOTE: does not disrupt tracking mode
 
     CLLocationCoordinate2D center = CLLocationCoordinate2DMake((northEastCoordinate.latitude + southWestCoordinate.latitude) / 2, (northEastCoordinate.longitude + southWestCoordinate.longitude) / 2);
-    
-    CGFloat scale = mbglMap->getScale();
-    CGFloat scaleX = mbglMap->getState().getWidth() / (northEastCoordinate.longitude - southWestCoordinate.longitude);
-    CGFloat scaleY = mbglMap->getState().getHeight() / (northEastCoordinate.latitude - southWestCoordinate.latitude);
-    CGFloat minZoom = mbglMap->getMinZoom();
-    CGFloat maxZoom = mbglMap->getMaxZoom();
+
+    CGFloat scale = _mbglMap->getScale();
+    CGFloat scaleX = _mbglMap->getWidth() / (northEastCoordinate.longitude - southWestCoordinate.longitude);
+    CGFloat scaleY = _mbglMap->getHeight() / (northEastCoordinate.latitude - southWestCoordinate.latitude);
+    CGFloat minZoom = _mbglMap->getMinZoom();
+    CGFloat maxZoom = _mbglMap->getMaxZoom();
     CGFloat zoomLevel = MAX(MIN(log(scale * MIN(scaleX, scaleY)) / log(2), maxZoom), minZoom);
-    
+
     [self setCenterCoordinate:center zoomLevel:zoomLevel animated:animated];
 }
 
 - (CLLocationDirection)direction
 {
-    double direction = mbglMap->getBearing() * -1;
+    double direction = _mbglMap->getBearing() * -1;
 
     while (direction > 360) direction -= 360;
     while (direction < 0) direction += 360;
@@ -1331,7 +1450,7 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
 
     CGFloat duration = (animated ? MGLAnimationDuration : 0);
 
-    mbglMap->setBearing(direction * -1, secondsAsDuration(duration));
+    _mbglMap->setBearing(direction * -1, secondsAsDuration(duration));
 
     [self notifyMapChange:@(animated ? mbgl::MapChangeRegionDidChangeAnimated : mbgl::MapChangeRegionDidChange)];
 }
@@ -1349,12 +1468,12 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
     //
     convertedPoint.y = self.bounds.size.height - convertedPoint.y;
 
-    return latLngToCoordinate(mbglMap->latLngForPixel(mbgl::vec2<double>(convertedPoint.x, convertedPoint.y)));
+    return latLngToCoordinate(_mbglMap->latLngForPixel(mbgl::vec2<double>(convertedPoint.x, convertedPoint.y)));
 }
 
 - (CGPoint)convertCoordinate:(CLLocationCoordinate2D)coordinate toPointToView:(UIView *)view
 {
-    mbgl::vec2<double> pixel = mbglMap->pixelForLatLng(coordinateToLatLng(coordinate));
+    mbgl::vec2<double> pixel = _mbglMap->pixelForLatLng(coordinateToLatLng(coordinate));
 
     // flip y coordinate for iOS view origin in top left
     //
@@ -1365,7 +1484,7 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
 
 - (CLLocationDistance)metersPerPixelAtLatitude:(CLLocationDegrees)latitude
 {
-    return mbglMap->getMetersPerPixelAtLatitude(latitude, self.zoomLevel);
+    return _mbglMap->getMetersPerPixelAtLatitude(latitude, self.zoomLevel);
 }
 
 mbgl::LatLng coordinateToLatLng(CLLocationCoordinate2D coordinate)
@@ -1400,7 +1519,7 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
 {
     if ( ! _bundledStyleURLs)
     {
-        NSString *stylesPath = [[MGLMapView resourceBundlePath] stringByAppendingPathComponent:@"styles"];
+        NSString *stylesPath = [[NSBundle mgl_resourceBundlePath] stringByAppendingPathComponent:@"styles"];
 
         _bundledStyleURLs = [NSMutableArray array];
 
@@ -1441,7 +1560,7 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
 {
     NSMutableArray *returnArray = [NSMutableArray array];
 
-    const std::vector<std::string> &appliedClasses = mbglMap->getClasses();
+    const std::vector<std::string> &appliedClasses = _mbglMap->getClasses();
 
     for (auto class_it = appliedClasses.begin(); class_it != appliedClasses.end(); class_it++)
     {
@@ -1465,20 +1584,20 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
         newAppliedClasses.insert(newAppliedClasses.end(), [appliedClass UTF8String]);
     }
 
-    mbglMap->setDefaultTransitionDuration(secondsAsDuration(transitionDuration));
-    mbglMap->setClasses(newAppliedClasses);
+    _mbglMap->setDefaultTransitionDuration(secondsAsDuration(transitionDuration));
+    _mbglMap->setClasses(newAppliedClasses);
 }
 
 - (BOOL)hasStyleClass:(NSString *)styleClass
 {
-    return styleClass && mbglMap->hasClass([styleClass UTF8String]);
+    return styleClass && _mbglMap->hasClass([styleClass UTF8String]);
 }
 
 - (void)addStyleClass:(NSString *)styleClass
 {
     if (styleClass)
     {
-        mbglMap->addClass([styleClass UTF8String]);
+        _mbglMap->addClass([styleClass UTF8String]);
     }
 }
 
@@ -1486,7 +1605,7 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
 {
     if (styleClass)
     {
-        mbglMap->removeClass([styleClass UTF8String]);
+        _mbglMap->removeClass([styleClass UTF8String]);
     }
 }
 
@@ -1550,7 +1669,7 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
         symbols.push_back((symbolName ? [symbolName UTF8String] : ""));
     }
 
-    std::vector<uint32_t> annotationIDs = mbglMap->addPointAnnotations(latLngs, symbols);
+    std::vector<uint32_t> annotationIDs = _mbglMap->addPointAnnotations(latLngs, symbols);
 
     for (size_t i = 0; i < annotationIDs.size(); ++i)
     {
@@ -1581,7 +1700,7 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
     {
         assert([annotation conformsToProtocol:@protocol(MGLAnnotation)]);
 
-        annotationIDsToRemove.push_back([[[self.annotationIDsByAnnotation objectForKey:annotation] 
+        annotationIDsToRemove.push_back([[[self.annotationIDsByAnnotation objectForKey:annotation]
             objectForKey:MGLAnnotationIDKey] unsignedIntValue]);
         [self.annotationIDsByAnnotation removeObjectForKey:annotation];
 
@@ -1591,7 +1710,7 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
         }
     }
 
-    mbglMap->removeAnnotations(annotationIDsToRemove);
+    _mbglMap->removeAnnotations(annotationIDsToRemove);
 }
 
 - (NSArray *)selectedAnnotations
@@ -1617,7 +1736,7 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
     if ( ! annotation) return;
 
     if ( ! [self viewportBounds].contains(coordinateToLatLng(annotation.coordinate))) return;
-    
+
     if (annotation == self.selectedAnnotation) return;
 
     self.userTrackingMode = MGLUserTrackingModeNone;
@@ -1651,7 +1770,7 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
 
             // determine anchor point based on symbol
             CGPoint calloutAnchorPoint = [self convertCoordinate:annotation.coordinate toPointToView:self];
-            double y = mbglMap->getTopOffsetPixelsForAnnotationSymbol(symbolName);
+            double y = _mbglMap->getTopOffsetPixelsForAnnotationSymbol(symbolName);
             calloutBounds = CGRectMake(calloutAnchorPoint.x - 1, calloutAnchorPoint.y + y, 0, 0);
         }
 
@@ -1736,22 +1855,22 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
 - (void)setShowsUserLocation:(BOOL)showsUserLocation
 {
     if (showsUserLocation == _showsUserLocation) return;
-    
+
     _showsUserLocation = showsUserLocation;
-    
+
     if (showsUserLocation)
     {
         if ([self.delegate respondsToSelector:@selector(mapViewWillStartLocatingUser:)])
         {
             [self.delegate mapViewWillStartLocatingUser:self];
         }
-        
+
         self.userLocationAnnotationView = [[MGLUserLocationAnnotationView alloc] initInMapView:self];
         self.userLocationAnnotationView.autoresizingMask = (UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin |
                                                             UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin);
-        
+
         self.locationManager = [CLLocationManager new];
-        
+
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000
         // enable iOS 8+ location authorization API
         //
@@ -1764,7 +1883,7 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
             [self.locationManager requestWhenInUseAuthorization];
         }
 #endif
-        
+
         self.locationManager.headingFilter = 5.0;
         self.locationManager.delegate = self;
         [self.locationManager startUpdatingLocation];
@@ -1782,7 +1901,7 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
         }
 
         [self setUserTrackingMode:MGLUserTrackingModeNone animated:YES];
-        
+
         [self.userLocationAnnotationView removeFromSuperview];
         self.userLocationAnnotationView = nil;
     }
@@ -1892,10 +2011,8 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
     }
 }
 
-- (void)locationManager:(CLLocationManager *)manager didUpdateToLocation:(CLLocation *)newLocation fromLocation:(CLLocation *)oldLocation
+- (void)locationManager:(__unused CLLocationManager *)manager didUpdateToLocation:(CLLocation *)newLocation fromLocation:(CLLocation *)oldLocation
 {
-    (void)manager;
-
     if ( ! _showsUserLocation || ! newLocation || ! CLLocationCoordinate2DIsValid(newLocation.coordinate)) return;
 
     if ([newLocation distanceFromLocation:oldLocation] || ! oldLocation)
@@ -1947,7 +2064,7 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
                 CLLocationCoordinate2D actualNorthEast = [self convertPoint:CGPointMake(userLocationPoint.x + pixelRadius,
                                                                                         userLocationPoint.y + pixelRadius)
                                                        toCoordinateFromView:self];
-                
+
                 if (desiredNorthEast.latitude  != actualNorthEast.latitude  ||
                     desiredNorthEast.longitude != actualNorthEast.longitude ||
                     desiredSouthWest.latitude  != actualSouthWest.latitude  ||
@@ -1968,19 +2085,15 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
 
 - (BOOL)locationManagerShouldDisplayHeadingCalibration:(CLLocationManager *)manager
 {
-    (void)manager;
-
-    if (self.displayHeadingCalibration) [self.locationManager performSelector:@selector(dismissHeadingCalibrationDisplay)
-                                                                   withObject:nil
-                                                                   afterDelay:10.0];
+    if (self.displayHeadingCalibration) [manager performSelector:@selector(dismissHeadingCalibrationDisplay)
+                                                      withObject:nil
+                                                      afterDelay:10.0];
 
     return self.displayHeadingCalibration;
 }
 
-- (void)locationManager:(CLLocationManager *)manager didUpdateHeading:(CLHeading *)newHeading
+- (void)locationManager:(__unused CLLocationManager *)manager didUpdateHeading:(CLHeading *)newHeading
 {
-    (void)manager;
-
     if ( ! _showsUserLocation || self.pan.state == UIGestureRecognizerStateBegan || newHeading.headingAccuracy < 0) return;
 
     self.userLocation.heading = newHeading;
@@ -1996,14 +2109,12 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
 
     if (headingDirection > 0 && self.userTrackingMode == MGLUserTrackingModeFollowWithHeading)
     {
-        mbglMap->setBearing(headingDirection, secondsAsDuration(MGLAnimationDuration));
+        _mbglMap->setBearing(headingDirection, secondsAsDuration(MGLAnimationDuration));
     }
 }
 
-- (void)locationManager:(CLLocationManager *)manager didChangeAuthorizationStatus:(CLAuthorizationStatus)status
+- (void)locationManager:(__unused CLLocationManager *)manager didChangeAuthorizationStatus:(CLAuthorizationStatus)status
 {
-    (void)manager;
-
     if (status == kCLAuthorizationStatusDenied || status == kCLAuthorizationStatusRestricted)
     {
         self.userTrackingMode  = MGLUserTrackingModeNone;
@@ -2011,10 +2122,8 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
     }
 }
 
-- (void)locationManager:(CLLocationManager *)manager didFailWithError:(NSError *)error
+- (void)locationManager:(__unused CLLocationManager *)manager didFailWithError:(NSError *)error
 {
-    (void)manager;
-
     if ([error code] == kCLErrorDenied)
     {
         self.userTrackingMode  = MGLUserTrackingModeNone;
@@ -2079,7 +2188,7 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
 
 - (CGFloat)currentMinimumZoom
 {
-    return fmaxf(mbglMap->getMinZoom(), MGLMinimumZoom);
+    return fmaxf(_mbglMap->getMinZoom(), MGLMinimumZoom);
 }
 
 - (BOOL)isRotationAllowed
@@ -2223,9 +2332,10 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
         }
         case mbgl::MapChangeDidFailLoadingMap:
         {
-            if ([self.delegate respondsToSelector:@selector(mapViewDidFailLoadingMap:withError::)])
+            if ([self.delegate respondsToSelector:@selector(mapViewDidFailLoadingMap:withError:)])
             {
-                [self.delegate mapViewDidFailLoadingMap:self withError:nil];
+                NSError *error = [NSError errorWithDomain:MGLErrorDomain code:0 userInfo:nil];
+                [self.delegate mapViewDidFailLoadingMap:self withError:error];
             }
             break;
         }
@@ -2284,13 +2394,13 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
 
 - (void)updateCompass
 {
-    double degrees = mbglMap->getBearing() * -1;
+    double degrees = _mbglMap->getBearing() * -1;
     while (degrees >= 360) degrees -= 360;
     while (degrees < 0) degrees += 360;
 
     self.compass.transform = CGAffineTransformMakeRotation([MGLMapView degreesToRadians:degrees]);
 
-    if (mbglMap->getBearing() && self.compass.alpha < 1)
+    if (_mbglMap->getBearing() && self.compass.alpha < 1)
     {
         [UIView animateWithDuration:MGLAnimationDuration
                               delay:0
@@ -2301,7 +2411,7 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
                          }
                          completion:nil];
     }
-    else if (mbglMap->getBearing() == 0 && self.compass.alpha > 0)
+    else if (_mbglMap->getBearing() == 0 && self.compass.alpha > 0)
     {
         [UIView animateWithDuration:MGLAnimationDuration
                               delay:0
@@ -2326,45 +2436,41 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
 
 + (NSString *)pathForBundleResourceNamed:(NSString *)name ofType:(NSString *)extension inDirectory:(NSString *)directory
 {
-    NSString *path = [[NSBundle bundleWithPath:[MGLMapView resourceBundlePath]] pathForResource:name ofType:extension inDirectory:directory];
+    NSString *path = [[NSBundle bundleWithPath:[NSBundle mgl_resourceBundlePath]] pathForResource:name ofType:extension inDirectory:directory];
 
     NSAssert(path, @"Resource not found in application.");
 
     return path;
 }
 
-+ (NSString *)resourceBundlePath
-{
-    NSString *resourceBundlePath = [[NSBundle bundleForClass:[MGLMapView class]] pathForResource:@"MapboxGL" ofType:@"bundle"];
-
-    if ( ! resourceBundlePath) resourceBundlePath = [[NSBundle mainBundle] bundlePath];
-
-    return resourceBundlePath;
-}
-
 - (void)invalidate
 {
-    assert([[NSThread currentThread] isMainThread]);
+    MGLAssertIsMainThread();
 
     [self.glView setNeedsDisplay];
 
     [self notifyMapChange:@(mbgl::MapChangeRegionIsChanging)];
 }
 
+- (BOOL)isFullyLoaded
+{
+    return _mbglMap->isFullyLoaded();
+}
+
 - (void)prepareForInterfaceBuilder
 {
     [super prepareForInterfaceBuilder];
-    
+
     self.layer.borderColor = [UIColor colorWithWhite:184/255. alpha:1].CGColor;
     self.layer.borderWidth = 1;
-    
+
     if (self.accessToken)
     {
         self.layer.backgroundColor = [UIColor colorWithRed:59/255.
                                                      green:178/255.
                                                       blue:208/255.
                                                      alpha:0.8].CGColor;
-        
+
         UIImage *image = [[self class] resourceImageNamed:@"mapbox.png"];
         UIImageView *previewView = [[UIImageView alloc] initWithImage:image];
         previewView.translatesAutoresizingMaskIntoConstraints = NO;
@@ -2391,7 +2497,7 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
         UIView *diagnosticView = [[UIView alloc] init];
         diagnosticView.translatesAutoresizingMaskIntoConstraints = NO;
         [self addSubview:diagnosticView];
-        
+
         // Headline
         UILabel *headlineLabel = [[UILabel alloc] init];
         headlineLabel.text = @"No Access Token";
@@ -2402,7 +2508,7 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
         [headlineLabel setContentCompressionResistancePriority:UILayoutPriorityDefaultLow
                                                        forAxis:UILayoutConstraintAxisHorizontal];
         [diagnosticView addSubview:headlineLabel];
-        
+
         // Explanation
         UILabel *explanationLabel = [[UILabel alloc] init];
         explanationLabel.text = @"To display a map here, you must provide a Mapbox access token. Get an access token from:";
@@ -2412,7 +2518,7 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
         [explanationLabel setContentCompressionResistancePriority:UILayoutPriorityDefaultLow
                                                           forAxis:UILayoutConstraintAxisHorizontal];
         [diagnosticView addSubview:explanationLabel];
-        
+
         // Link
         UIButton *linkButton = [UIButton buttonWithType:UIButtonTypeSystem];
         [linkButton setTitle:MGLMapboxAccessTokenManagerURLDisplayString forState:UIControlStateNormal];
@@ -2420,7 +2526,7 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
         [linkButton setContentCompressionResistancePriority:UILayoutPriorityDefaultLow
                                                     forAxis:UILayoutConstraintAxisHorizontal];
         [diagnosticView addSubview:linkButton];
-        
+
         // More explanation
         UILabel *explanationLabel2 = [[UILabel alloc] init];
         explanationLabel2.text = @"and enter it into the Access Token field in the Attributes inspector.";
@@ -2430,7 +2536,7 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng)
         [explanationLabel2 setContentCompressionResistancePriority:UILayoutPriorityDefaultLow
                                                            forAxis:UILayoutConstraintAxisHorizontal];
         [diagnosticView addSubview:explanationLabel2];
-        
+
         // Constraints
         NSDictionary *views = @{
             @"container": diagnosticView,
@@ -2521,12 +2627,7 @@ class MBGLView : public mbgl::View
         [EAGLContext setCurrentContext:nil];
     }
 
-    void resize(uint16_t width, uint16_t height, float ratio, uint16_t fbWidth, uint16_t fbHeight)
-    {
-        View::resize(width, height, ratio, fbWidth, fbHeight);
-    }
-
-    void invalidate() override
+    void invalidate(std::function<void()>) override
     {
         [nativeView performSelectorOnMainThread:@selector(invalidate)
                                      withObject:nil
@@ -2640,7 +2741,7 @@ class MBGLView : public mbgl::View
 
 - (void)didReceiveMemoryWarning
 {
-    mbglMap->onLowMemory();
+    _mbglMap->onLowMemory();
 }
 
 @end
diff --git a/include/mbgl/ios/MGLMapboxEvents.h b/platform/ios/MGLMapboxEvents.h
similarity index 90%
rename from include/mbgl/ios/MGLMapboxEvents.h
rename to platform/ios/MGLMapboxEvents.h
index 7a4c45fe1..94aa8be78 100644
--- a/include/mbgl/ios/MGLMapboxEvents.h
+++ b/platform/ios/MGLMapboxEvents.h
@@ -4,6 +4,7 @@ extern NSString *const MGLEventTypeMapLoad;
 extern NSString *const MGLEventTypeMapTap;
 extern NSString *const MGLEventTypeMapDragEnd;
 extern NSString *const MGLEventTypeLocation;
+extern NSString *const MGLEventTypeVisit;
 
 extern NSString *const MGLEventKeyLatitude;
 extern NSString *const MGLEventKeyLongitude;
@@ -16,6 +17,8 @@ extern NSString *const MGLEventKeyVerticalAccuracy;
 extern NSString *const MGLEventKeyPushEnabled;
 extern NSString *const MGLEventKeyEmailEnabled;
 extern NSString *const MGLEventKeyGestureID;
+extern NSString *const MGLEventKeyArrivalDate;
+extern NSString *const MGLEventKeyDepartureDate;
 
 extern NSString *const MGLEventGestureSingleTap;
 extern NSString *const MGLEventGestureDoubleTap;
@@ -27,11 +30,10 @@ extern NSString *const MGLEventGestureRotateStart;
 
 @interface MGLMapboxEvents : NSObject <NSURLSessionDelegate>
 
++ (instancetype)sharedManager;
+
 // You must call these methods from the main thread.
 //
-+ (void) setToken:(NSString *)token;
-+ (void) setAppName:(NSString *)appName;
-+ (void) setAppVersion:(NSString *)appVersion;
 + (void) pauseMetricsCollection;
 + (void) resumeMetricsCollection;
 
@@ -54,4 +56,7 @@ extern NSString *const MGLEventGestureRotateStart;
 //
 + (void) flush;
 
+// Main thread only
++ (void)validate;
+
 @end
diff --git a/platform/ios/MGLMapboxEvents.m b/platform/ios/MGLMapboxEvents.m
index ee1ae82e7..98bfe21cf 100644
--- a/platform/ios/MGLMapboxEvents.m
+++ b/platform/ios/MGLMapboxEvents.m
@@ -4,19 +4,23 @@
 #import <SystemConfiguration/CaptiveNetwork.h>
 #import <CoreTelephony/CTTelephonyNetworkInfo.h>
 #import <CoreTelephony/CTCarrier.h>
+#import <CoreLocation/CoreLocation.h>
 
-#import "MGLMetricsLocationManager.h"
+#import "MGLAccountManager.h"
 #import "NSProcessInfo+MGLAdditions.h"
+#import "NSBundle+MGLAdditions.h"
+#import "NSException+MGLAdditions.h"
 
 #include <sys/sysctl.h>
 
 static NSString *const MGLMapboxEventsUserAgent = @"MapboxEventsiOS/1.0";
-static NSString *const MGLMapboxEventsAPIBase = @"https://api.tiles.mapbox.com";
+static NSString *MGLMapboxEventsAPIBase = @"https://api.tiles.mapbox.com";
 
 NSString *const MGLEventTypeMapLoad = @"map.load";
 NSString *const MGLEventTypeMapTap = @"map.click";
 NSString *const MGLEventTypeMapDragEnd = @"map.dragend";
 NSString *const MGLEventTypeLocation = @"location";
+NSString *const MGLEventTypeVisit = @"visit";
 
 NSString *const MGLEventKeyLatitude = @"lat";
 NSString *const MGLEventKeyLongitude = @"lng";
@@ -29,6 +33,8 @@ NSString *const MGLEventKeyVerticalAccuracy = @"verticalAccuracy";
 NSString *const MGLEventKeyPushEnabled = @"enabled.push";
 NSString *const MGLEventKeyEmailEnabled = @"enabled.email";
 NSString *const MGLEventKeyGestureID = @"gesture";
+NSString *const MGLEventKeyArrivalDate = @"arrivalDate";
+NSString *const MGLEventKeyDepartureDate = @"departureDate";
 
 NSString *const MGLEventGestureSingleTap = @"SingleTap";
 NSString *const MGLEventGestureDoubleTap = @"DoubleTap";
@@ -38,127 +44,30 @@ NSString *const MGLEventGesturePanStart = @"Pan";
 NSString *const MGLEventGesturePinchStart = @"Pinch";
 NSString *const MGLEventGestureRotateStart = @"Rotation";
 
-//
-// Threadsafety conventions:
-//
-// All variables accessed from more than one thread are
-// designated `atomic` and accessed through dot syntax. The
-// main thread uses underscore syntax during the
-// initialization of the variable.
-//
-// All variables accessed outside of initialization and
-// from within a single thread use underscore syntax.
-//
-// All captures of `self` from within asynchronous
-// dispatches will use a `strongSelf` to avoid cyclical
-// strong references.
-//
+const NSUInteger MGLMaximumEventsPerFlush = 20;
+const NSTimeInterval MGLFlushInterval = 60;
 
-@interface MGLMapboxEvents()
+@interface MGLMapboxEventsData : NSObject
 
 // All of the following properties are written to only from
 // the main thread, but can be read on any thread.
 //
-@property (atomic) NSString *token;
-@property (atomic) NSString *appName;
-@property (atomic) NSString *appVersion;
 @property (atomic) NSString *instanceID;
 @property (atomic) NSString *advertiserId;
 @property (atomic) NSString *vendorId;
-@property (atomic) NSString *appBundleId;
-@property (atomic) NSString *userAgent;
 @property (atomic) NSString *model;
 @property (atomic) NSString *iOSVersion;
 @property (atomic) NSString *carrier;
-@property (atomic) NSUInteger flushAt;
-@property (atomic) NSDateFormatter *rfc3339DateFormatter;
 @property (atomic) CGFloat scale;
-@property (atomic) NSURLSession *session;
-@property (atomic) NSData *geoTrustCert;
-
-
-// The isPaused state tracker is only ever accessed from the main thread.
-//
-@property (nonatomic) BOOL isPaused;
-
-// The timer is only ever accessed from the main thread.
-//
-@property (nonatomic) NSTimer *timer;
-
-// The flush expiration time is only ever accessed from the main thread.
-//
-@property (nonatomic) NSTimeInterval flushAfter;
-
-// This is an array of events to push. All access to it will be
-// from our own serial queue.
-//
-@property (nonatomic) NSMutableArray *eventQueue;
-
-// This is a custom serial queue for accessing the event queue.
-//
-@property (nonatomic) dispatch_queue_t serialQueue;
 
 @end
 
-@implementation MGLMapboxEvents
+@implementation MGLMapboxEventsData
 
-// Must be called from the main thread. Only called internally.
-//
-- (instancetype) init {
-    assert([[NSThread currentThread] isMainThread]);
-
-    self = [super init];
-    if (self) {
-        
-        // Put Settings bundle into memory
-        NSString *settingsBundle = [[NSBundle mainBundle] pathForResource:@"Settings" ofType:@"bundle"];
-        if(!settingsBundle) {
-            NSLog(@"Could not find Settings.bundle");
-        } else {
-            // Dynamic Settings.bundle loading based on:
-            // http://stackoverflow.com/questions/510216/can-you-make-the-settings-in-settings-bundle-default-even-if-you-dont-open-the
-            NSDictionary *settings = [NSDictionary dictionaryWithContentsOfFile:[settingsBundle stringByAppendingPathComponent:@"Root.plist"]];
-            NSArray *preferences = [settings objectForKey:@"PreferenceSpecifiers"];
-            NSMutableDictionary *defaultsToRegister = [[NSMutableDictionary alloc] initWithCapacity:[preferences count]];
-            for(NSDictionary *prefSpecification in preferences) {
-                NSString *key = [prefSpecification objectForKey:@"Key"];
-                if(key && [[prefSpecification allKeys] containsObject:@"DefaultValue"]) {
-                    [defaultsToRegister setObject:[prefSpecification objectForKey:@"DefaultValue"] forKey:key];
-                }
-            }
-            
-            [[NSUserDefaults standardUserDefaults] registerDefaults:defaultsToRegister];
-        }
-        _appBundleId = [[NSBundle mainBundle] bundleIdentifier];
-        NSString *uniqueID = [[NSProcessInfo processInfo] globallyUniqueString];
-        _serialQueue = dispatch_queue_create([[NSString stringWithFormat:@"%@.%@.events.serial", _appBundleId, uniqueID] UTF8String], DISPATCH_QUEUE_SERIAL);
-
-        // Configure Events Infrastructure
-        // ===============================
-
-         _session = [NSURLSession sessionWithConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration] delegate:self delegateQueue:nil];
-
-        // Load Local Copy of Server's Public Key
-        NSString *cerPath = nil;
-        NSArray *bundles = [NSBundle allFrameworks];
-        for (int lc = 0; lc < bundles.count; lc++) {
-            NSBundle *b = [bundles objectAtIndex:lc];
-            cerPath = [[NSBundle mainBundle] pathForResource:@"api_mapbox_com-geotrust" ofType:@"der"];
-            if (cerPath != nil) {
-                break;
-            }
-        }
-        if (cerPath != nil) {
-            _geoTrustCert = [NSData dataWithContentsOfFile:cerPath];
-        }
-
-        // Events Control
-        _eventQueue = [[NSMutableArray alloc] init];
-        _flushAt = 20;
-        _flushAfter = 60;
-        _token = nil;
+- (instancetype)init {
+    if (self = [super init]) {
         _instanceID = [[NSUUID UUID] UUIDString];
-
+        
         // Dynamic detection of ASIdentifierManager from Mixpanel
         // https://github.com/mixpanel/mixpanel-iphone/blob/master/LICENSE
         _advertiserId = @"";
@@ -177,7 +86,7 @@ NSString *const MGLEventGestureRotateStart = @"Rotation";
         }
         _vendorId = [[[UIDevice currentDevice] identifierForVendor] UUIDString];
         
-        _model = [self getSysInfoByName:"hw.machine"];
+        _model = [self sysInfoByName:"hw.machine"];
         _iOSVersion = [NSString stringWithFormat:@"%@ %@", [UIDevice currentDevice].systemName, [UIDevice currentDevice].systemVersion];
         if ([UIScreen instancesRespondToSelector:@selector(nativeScale)]) {
             _scale = [UIScreen mainScreen].nativeScale;
@@ -186,8 +95,165 @@ NSString *const MGLEventGestureRotateStart = @"Rotation";
         }
         CTCarrier *carrierVendor = [[[CTTelephonyNetworkInfo alloc] init] subscriberCellularProvider];
         _carrier = [carrierVendor carrierName];
+    }
+    return self;
+}
+
+// Can be called from any thread.
+//
+- (NSString *)sysInfoByName:(char *)typeSpecifier
+{
+    size_t size;
+    sysctlbyname(typeSpecifier, NULL, &size, NULL, 0);
+    
+    char *answer = malloc(size);
+    sysctlbyname(typeSpecifier, answer, &size, NULL, 0);
+    
+    NSString *results = [NSString stringWithCString:answer encoding: NSUTF8StringEncoding];
+    
+    free(answer);
+    return results;
+}
+
+@end
+
+//
+// Threadsafety conventions:
+//
+// All variables accessed from more than one thread are
+// designated `atomic` and accessed through dot syntax. The
+// main thread uses underscore syntax during the
+// initialization of the variable.
+//
+// All variables accessed outside of initialization and
+// from within a single thread use underscore syntax.
+//
+// All captures of `self` from within asynchronous
+// dispatches will use a `strongSelf` to avoid cyclical
+// strong references.
+//
+
+@interface MGLMapboxEvents () <CLLocationManagerDelegate>
+
+// All of the following properties are written to only from
+// the main thread, but can be read on any thread.
+//
+@property (atomic) MGLMapboxEventsData *data;
+@property (atomic) NSString *appBundleId;
+@property (atomic) NSString *appName;
+@property (atomic) NSString *appVersion;
+@property (atomic) NSString *appBuildNumber;
+@property (atomic) NSDateFormatter *rfc3339DateFormatter;
+@property (atomic) NSURLSession *session;
+@property (atomic) NSData *digicertCert;
+@property (atomic) NSData *geoTrustCert;
+
+// Main thread only
+@property (nonatomic) CLLocationManager *locationManager;
+
+// The paused state tracker is only ever accessed from the main thread.
+//
+@property (nonatomic, getter=isPaused) BOOL paused;
+
+// The timer is only ever accessed from the main thread.
+//
+@property (nonatomic) NSTimer *timer;
+
+// This is an array of events to push. All access to it will be
+// from our own serial queue.
+//
+@property (nonatomic) NSMutableArray *eventQueue;
+
+// This is a custom serial queue for accessing the event queue.
+//
+@property (nonatomic) dispatch_queue_t serialQueue;
+
+@end
+
+@implementation MGLMapboxEvents {
+    id _userDefaultsObserver;
+}
+
++ (void)initialize {
+    if (self == [MGLMapboxEvents class]) {
+        [[NSUserDefaults standardUserDefaults] registerDefaults:@{
+             @"MGLMapboxAccountType": @0,
+             @"MGLMapboxMetricsEnabled": @YES,
+         }];
+    }
+}
+
++ (BOOL)isEnabled {
+    return ([[NSUserDefaults standardUserDefaults] boolForKey:@"MGLMapboxMetricsEnabled"] &&
+            [[NSUserDefaults standardUserDefaults] integerForKey:@"MGLMapboxAccountType"] == 0);
+}
+
+// Must be called from the main thread. Only called internally.
+//
+- (instancetype) init {
+    MGLAssertIsMainThread();
+
+    self = [super init];
+    if (self) {
+        if (! [MGLAccountManager mapboxMetricsEnabledSettingShownInApp]) {
+            // Opt Out is not configured in UI, so check for Settings.bundle
+            // Put Settings bundle into memory
+            id defaultEnabledValue;
+            NSString *appSettingsBundle = [[NSBundle mainBundle] pathForResource:@"Settings" ofType:@"bundle"];
+
+            if (appSettingsBundle) {
+                // Dynamic Settings.bundle loading based on:
+                // http://stackoverflow.com/questions/510216/can-you-make-the-settings-in-settings-bundle-default-even-if-you-dont-open-the
+                NSDictionary *settings = [NSDictionary dictionaryWithContentsOfFile:[appSettingsBundle stringByAppendingPathComponent:@"Root.plist"]];
+                NSArray *preferences = settings[@"PreferenceSpecifiers"];
+                for (NSDictionary *prefSpecification in preferences) {
+                    if ([prefSpecification[@"Key"] isEqualToString:@"MGLMapboxMetricsEnabled"]) {
+                        defaultEnabledValue = prefSpecification[@"DefaultValue"];
+                    }
+                }
+            }
+
+            NSAssert(defaultEnabledValue, @"End users must be able to opt out of Metrics in your app, either inside Settings (via Settings.bundle) or inside this app. If you implement the opt-out control inside this app, disable this assertion by setting [MGLAccountManager setMapboxMetricsEnabledSettingShownInApp:YES] before the app initializes any Mapbox GL classes.");
+            [[NSUserDefaults standardUserDefaults] registerDefaults:@{
+                 @"MGLMapboxMetricsEnabled": defaultEnabledValue,
+             }];
+        }
+
+        _appBundleId = [[NSBundle mainBundle] bundleIdentifier];
+        _appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"];
+        _appVersion = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
+        _appBuildNumber = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"];
         
-        _userAgent = MGLMapboxEventsUserAgent;
+        NSString *uniqueID = [[NSProcessInfo processInfo] globallyUniqueString];
+        _serialQueue = dispatch_queue_create([[NSString stringWithFormat:@"%@.%@.events.serial", _appBundleId, uniqueID] UTF8String], DISPATCH_QUEUE_SERIAL);
+
+        // Configure Events Infrastructure
+        // ===============================
+
+        // Check for TEST Metrics URL
+        NSString *testURL = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"MGLMetricsTestServerURL"];
+        if (testURL != nil) {
+            MGLMapboxEventsAPIBase = testURL;
+        }
+
+        _paused = YES;
+        [self resumeMetricsCollection];
+        NSBundle *resourceBundle = [NSBundle bundleWithPath:[NSBundle mgl_resourceBundlePath]];
+
+        // Load Local Copy of Server's Public Key
+        NSString *cerPath = nil;
+        cerPath = [resourceBundle pathForResource:@"api_mapbox_com-geotrust" ofType:@"der"];
+        if (cerPath != nil) {
+            _geoTrustCert = [NSData dataWithContentsOfFile:cerPath];
+        }
+
+        cerPath = [resourceBundle pathForResource:@"api_mapbox_com-digicert" ofType:@"der"];
+        if (cerPath != nil) {
+            _digicertCert = [NSData dataWithContentsOfFile:cerPath];
+        }
+
+        // Events Control
+        _eventQueue = [[NSMutableArray alloc] init];
         
         // Setup Date Format
         _rfc3339DateFormatter = [[NSDateFormatter alloc] init];
@@ -202,78 +268,150 @@ NSString *const MGLEventGestureRotateStart = @"Rotation";
         // Enable Battery Monitoring
         [UIDevice currentDevice].batteryMonitoringEnabled = YES;
         
-        _isPaused = NO;
+        __weak MGLMapboxEvents *weakSelf = self;
+        _userDefaultsObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSUserDefaultsDidChangeNotification
+                                                                                  object:nil
+                                                                                   queue:[NSOperationQueue mainQueue]
+                                                                              usingBlock:
+         ^(NSNotification *notification) {
+             MGLMapboxEvents *strongSelf = weakSelf;
+             [strongSelf validate];
+         }];
     }
     return self;
 }
 
 // Can be called from any thread. Called implicitly from any
-// public class convenience methods.
+// public class convenience methods. May return nil if this feature is disabled.
 //
 + (instancetype)sharedManager {
+    if (NSProcessInfo.processInfo.mgl_isInterfaceBuilderDesignablesAgent) {
+        return nil;
+    }
     static dispatch_once_t onceToken;
     static MGLMapboxEvents *_sharedManager;
-    dispatch_once(&onceToken, ^{
-        if ( ! NSProcessInfo.processInfo.mgl_isInterfaceBuilderDesignablesAgent) {
-            void (^setupBlock)() = ^{
-                _sharedManager = [[self alloc] init];
-                // setup dedicated location manager on first use
-                [MGLMetricsLocationManager sharedManager];
-            };
-            if ( ! [[NSThread currentThread] isMainThread]) {
-                dispatch_sync(dispatch_get_main_queue(), ^{
-                    setupBlock();
-                });
-            }
-            else {
-                setupBlock();
-            }
-        }
-    });
+    void (^setupBlock)() = ^{
+        dispatch_once(&onceToken, ^{
+            _sharedManager = [[self alloc] init];
+        });
+    };
+    if ( ! [[NSThread currentThread] isMainThread]) {
+        dispatch_sync(dispatch_get_main_queue(), ^{
+            setupBlock();
+        });
+    }
+    else {
+        setupBlock();
+    }
     return _sharedManager;
 }
 
-// Must be called from the main thread.
-//
-+ (void) setToken:(NSString *)token {
-    assert([[NSThread currentThread] isMainThread]);
-    [MGLMapboxEvents sharedManager].token = token;
+- (void)dealloc {
+    [[NSNotificationCenter defaultCenter] removeObserver:_userDefaultsObserver];
+    [self pauseMetricsCollection];
+}
+
++ (void)validate {
+    [[MGLMapboxEvents sharedManager] validate];
+}
+
+- (void)validate {
+    MGLAssertIsMainThread();
+    BOOL enabledInSettings = [[self class] isEnabled];
+    if (self.paused && enabledInSettings) {
+        [self resumeMetricsCollection];
+    } else if (!self.paused && !enabledInSettings) {
+        [self pauseMetricsCollection];
+    }
+    
+    [self validateUpdatingLocation];
+}
+
+- (void)validateUpdatingLocation {
+    MGLAssertIsMainThread();
+    if (self.paused) {
+        [self stopUpdatingLocation];
+    } else {
+        CLAuthorizationStatus authStatus = [CLLocationManager authorizationStatus];
+        if (authStatus == kCLAuthorizationStatusDenied ||
+            authStatus == kCLAuthorizationStatusRestricted) {
+            [self stopUpdatingLocation];
+        } else if (authStatus == kCLAuthorizationStatusAuthorized ||
+                   authStatus == kCLAuthorizationStatusAuthorizedWhenInUse) {
+            [self startUpdatingLocation];
+        }
+    }
+}
+
++ (void)pauseMetricsCollection {
+    [[MGLMapboxEvents sharedManager] pauseMetricsCollection];
 }
 
 // Must be called from the main thread.
 //
-+ (void) setAppName:(NSString *)appName {
-    assert([[NSThread currentThread] isMainThread]);
-    [MGLMapboxEvents sharedManager].appName = appName;
-}
-
-// Must be called from the main thread.
-//
-+ (void) setAppVersion:(NSString *)appVersion {
-    assert([[NSThread currentThread] isMainThread]);
-    [MGLMapboxEvents sharedManager].appVersion = appVersion;
-}
-
-// Must be called from the main thread.
-//
-+ (void) pauseMetricsCollection {
-    assert([[NSThread currentThread] isMainThread]);
-    if ([MGLMapboxEvents sharedManager].isPaused) {
+- (void)pauseMetricsCollection {
+    MGLAssertIsMainThread();
+    if (self.paused) {
         return;
     }
-    [MGLMapboxEvents sharedManager].isPaused = YES;
-    [MGLMetricsLocationManager stopUpdatingLocation];
+    self.paused = YES;
+    [_timer invalidate];
+    _timer = nil;
+    [_eventQueue removeAllObjects];
+    _data = nil;
+    [_session invalidateAndCancel];
+    _session = nil;
+    
+    [self validateUpdatingLocation];
+}
+
+- (void)stopUpdatingLocation {
+    [_locationManager stopUpdatingLocation];
+    
+    // -[CLLocationManager stopMonitoringVisits] is only available in iOS 8+.
+    if ([_locationManager respondsToSelector:@selector(stopMonitoringVisits)]) {
+        [_locationManager stopMonitoringVisits];
+    }
+    
+    _locationManager = nil;
+}
+
++ (void)resumeMetricsCollection {
+    [[MGLMapboxEvents sharedManager] resumeMetricsCollection];
 }
 
 // Must be called from the main thread.
 //
-+ (void) resumeMetricsCollection {
-    assert([[NSThread currentThread] isMainThread]);
-    if (![MGLMapboxEvents sharedManager].isPaused) {
+- (void)resumeMetricsCollection {
+    MGLAssertIsMainThread();
+    if (!self.paused || ![[self class] isEnabled]) {
         return;
     }
-    [MGLMapboxEvents sharedManager].isPaused = NO;
-    [MGLMetricsLocationManager startUpdatingLocation];
+    self.paused = NO;
+    _data = [[MGLMapboxEventsData alloc] init];
+    _session = [NSURLSession sessionWithConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration] delegate:self delegateQueue:nil];
+    
+    [self validateUpdatingLocation];
+}
+
+- (void)startUpdatingLocation {
+    MGLAssertIsMainThread();
+    if (_locationManager || _paused) {
+        NSAssert(!(_locationManager && _paused),
+                 @"MGLMapboxEvents should not have a CLLocationManager while paused.");
+        return;
+    }
+    _locationManager = [[CLLocationManager alloc] init];
+    _locationManager.desiredAccuracy = kCLLocationAccuracyKilometer;
+    _locationManager.distanceFilter = 10;
+    _locationManager.delegate = self;
+    
+    [_locationManager startUpdatingLocation];
+    
+    // -[CLLocationManager startMonitoringVisits] is only available in iOS 8+.
+    if ([_locationManager respondsToSelector:@selector(startMonitoringVisits)]) {
+        [_locationManager startMonitoringVisits];
+    }
 }
 
 // Can be called from any thread. Can be called rapidly from
@@ -295,20 +433,8 @@ NSString *const MGLEventGestureRotateStart = @"Rotation";
         MGLMapboxEvents *strongSelf = weakSelf;
         if ( ! strongSelf) return;
         
-        // Opt Out Checking When Built
-        if (![[NSUserDefaults standardUserDefaults] boolForKey:@"mapbox_metrics_enabled_preference"]) {
-            [_eventQueue removeAllObjects];
-            return;
-        }
-
-        // Add Metrics Disabled App Wide Check
-        if ([[NSUserDefaults standardUserDefaults] objectForKey:@"mapbox_metrics_disabled"] != nil) {
-            [_eventQueue removeAllObjects];
-            return;
-        }
-        
         // Metrics Collection Has Been Paused
-        if (_isPaused) {
+        if (_paused) {
             return;
         }
         
@@ -319,34 +445,34 @@ NSString *const MGLEventGestureRotateStart = @"Rotation";
         [evt setObject:event forKey:@"event"];
         [evt setObject:@(1) forKey:@"version"];
         [evt setObject:[strongSelf.rfc3339DateFormatter stringFromDate:[NSDate date]] forKey:@"created"];
-        [evt setObject:strongSelf.instanceID forKey:@"instance"];
-        [evt setObject:strongSelf.advertiserId forKey:@"advertiserId"];
-        [evt setObject:strongSelf.vendorId forKey:@"vendorId"];
+        [evt setObject:strongSelf.data.instanceID forKey:@"instance"];
+        [evt setObject:strongSelf.data.advertiserId forKey:@"advertiserId"];
+        [evt setObject:strongSelf.data.vendorId forKey:@"vendorId"];
         [evt setObject:strongSelf.appBundleId forKeyedSubscript:@"appBundleId"];
         
         // mapbox-events-ios stock attributes
-        [evt setValue:strongSelf.model forKey:@"model"];
-        [evt setValue:strongSelf.iOSVersion forKey:@"operatingSystem"];
-        [evt setValue:[strongSelf getDeviceOrientation] forKey:@"orientation"];
+        [evt setValue:strongSelf.data.model forKey:@"model"];
+        [evt setValue:strongSelf.data.iOSVersion forKey:@"operatingSystem"];
+        [evt setValue:[strongSelf deviceOrientation] forKey:@"orientation"];
         [evt setValue:@((int)(100 * [UIDevice currentDevice].batteryLevel)) forKey:@"batteryLevel"];
-        [evt setValue:@(strongSelf.scale) forKey:@"resolution"];
-        [evt setValue:strongSelf.carrier forKey:@"carrier"];
+        [evt setValue:@(strongSelf.data.scale) forKey:@"resolution"];
+        [evt setValue:strongSelf.data.carrier forKey:@"carrier"];
         
-        NSString *cell = [strongSelf getCurrentCellularNetworkConnectionType];
+        NSString *cell = [strongSelf currentCellularNetworkConnectionType];
         if (cell) {
             [evt setValue:cell forKey:@"cellularNetworkType"];
         } else {
             [evt setObject:[NSNull null] forKey:@"cellularNetworkType"];
         }
         
-        NSString *wifi = [strongSelf getWifiNetworkName];
+        NSString *wifi = [strongSelf wifiNetworkName];
         if (wifi) {
             [evt setValue:wifi forKey:@"wifi"];
         } else {
             [evt setObject:[NSNull null] forKey:@"wifi"];
         }
         
-        [evt setValue:@([strongSelf getContentSizeScale]) forKey:@"accessibilityFontScale"];
+        [evt setValue:@([strongSelf contentSizeScale]) forKey:@"accessibilityFontScale"];
 
         // Make Immutable Version
         NSDictionary *finalEvent = [NSDictionary dictionaryWithDictionary:evt];
@@ -355,12 +481,12 @@ NSString *const MGLEventGestureRotateStart = @"Rotation";
         [_eventQueue addObject:finalEvent];
         
         // Has Flush Limit Been Reached?
-        if (_eventQueue.count >= strongSelf.flushAt) {
+        if (_eventQueue.count >= MGLMaximumEventsPerFlush) {
             [strongSelf flush];
+        } else if (_eventQueue.count ==  1) {
+            // If this is first new event on queue start timer,
+            [strongSelf startTimer];
         }
-        
-        // Reset Timer (Initial Starting of Timer after first event is pushed)
-        [strongSelf startTimer];
     });
 }
 
@@ -373,33 +499,28 @@ NSString *const MGLEventGestureRotateStart = @"Rotation";
 // Can be called from any thread.
 //
 - (void) flush {
-    if (self.token == nil) return;
+    if ([MGLAccountManager accessToken] == nil) return;
 
     __weak MGLMapboxEvents *weakSelf = self;
 
     dispatch_async(_serialQueue, ^{
         MGLMapboxEvents *strongSelf = weakSelf;
-        if ( ! strongSelf) return;
-        
-        __block NSArray *events;
+        if ( ! strongSelf || [_eventQueue count] == 0) return;
+
+        // Make an immutable copy
+        NSArray *events = [NSArray arrayWithArray:_eventQueue];
 
-        NSUInteger upper = strongSelf.flushAt;
-        if (strongSelf.flushAt > [_eventQueue count]) {
-            if ([_eventQueue count] == 0) {
-                return;
-            }
-            upper = [_eventQueue count];
-        }
-    
-        // Create Array of Events to push to the Server
-        NSRange theRange = NSMakeRange(0, upper);
-        events = [_eventQueue subarrayWithRange:theRange];
-    
         // Update Queue to remove events sent to server
-        [_eventQueue removeObjectsInRange:theRange];
+        [_eventQueue removeAllObjects];
 
         // Send Array of Events to Server
         [strongSelf postEvents:events];
+
+        // Cancel Any Timer That May Running
+        if (strongSelf.timer) {
+            [strongSelf.timer invalidate];
+            strongSelf.timer = nil;
+        }
     });
 }
 
@@ -414,9 +535,9 @@ NSString *const MGLEventGestureRotateStart = @"Rotation";
         if (!strongSelf) return;
 
         // Setup URL Request
-        NSString *url = [NSString stringWithFormat:@"%@/events/v1?access_token=%@", MGLMapboxEventsAPIBase, strongSelf.token];
+        NSString *url = [NSString stringWithFormat:@"%@/events/v1?access_token=%@", MGLMapboxEventsAPIBase, [MGLAccountManager accessToken]];
         NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:url]];
-        [request setValue:[strongSelf getUserAgent] forHTTPHeaderField:@"User-Agent"];
+        [request setValue:strongSelf.userAgent forHTTPHeaderField:@"User-Agent"];
         [request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
         [request setHTTPMethod:@"POST"];
         
@@ -437,14 +558,11 @@ NSString *const MGLEventGestureRotateStart = @"Rotation";
 - (void) startTimer {
     void (^timerBlock)() = ^{
         // Stop Timer if it already exists
-        if (_timer) {
-            [_timer invalidate];
-            _timer = nil;
-        }
+        [_timer invalidate];
 
         // Start New Timer
-        _timer = [NSTimer scheduledTimerWithTimeInterval:_flushAfter
-                                                  target:[self class]
+        _timer = [NSTimer scheduledTimerWithTimeInterval:MGLFlushInterval
+                                                  target:self
                                                 selector:@selector(flush)
                                                 userInfo:nil
                                                  repeats:YES];
@@ -461,22 +579,13 @@ NSString *const MGLEventGestureRotateStart = @"Rotation";
 
 // Can be called from any thread.
 //
-- (NSString *) getUserAgent {
-    if (self.appName != nil && self.appVersion != nil && ([self.userAgent rangeOfString:self.appName].location == NSNotFound)) {
-        self.userAgent = [NSString stringWithFormat:@"%@/%@ %@", self.appName, self.appVersion, self.userAgent];
-    }
-    return self.userAgent;
+- (NSString *) userAgent {
+    return [NSString stringWithFormat:@"%@/%@/%@ %@", self.appName, self.appVersion, self.appBuildNumber, MGLMapboxEventsUserAgent];
 }
 
 // Can be called from any thread.
 //
-- (NSString *) formatDate:(NSDate *)date {
-    return [self.rfc3339DateFormatter stringFromDate:date];
-}
-
-// Can be called from any thread.
-//
-- (NSString *) getDeviceOrientation {
+- (NSString *) deviceOrientation {
     __block NSString *result;
 
     NSString *(^deviceOrientationBlock)(void) = ^{
@@ -523,7 +632,7 @@ NSString *const MGLEventGestureRotateStart = @"Rotation";
 
 // Can be called from any thread.
 //
-- (NSInteger) getContentSizeScale {
+- (NSInteger) contentSizeScale {
     __block NSInteger result = -9999;
 
     NSInteger (^contentSizeScaleBlock)(void) = ^{
@@ -571,31 +680,16 @@ NSString *const MGLEventGestureRotateStart = @"Rotation";
 
 // Can be called from any thread.
 //
-- (NSString *)getSysInfoByName:(char *)typeSpecifier
-{
-    size_t size;
-    sysctlbyname(typeSpecifier, NULL, &size, NULL, 0);
-    
-    char *answer = malloc(size);
-    sysctlbyname(typeSpecifier, answer, &size, NULL, 0);
-    
-    NSString *results = [NSString stringWithCString:answer encoding: NSUTF8StringEncoding];
-    
-    free(answer);
-    return results;
-}
-
-// Can be called from any thread.
-//
-- (NSString *) getWifiNetworkName {
+- (NSString *) wifiNetworkName {
     
     NSString *ssid = nil;
     CFArrayRef interfaces = CNCopySupportedInterfaces();
     if (interfaces) {
-        NSDictionary *info = (__bridge NSDictionary *)CNCopyCurrentNetworkInfo(CFArrayGetValueAtIndex(interfaces, 0));
+        NSDictionary *info = CFBridgingRelease(CNCopyCurrentNetworkInfo(CFArrayGetValueAtIndex(interfaces, 0)));
         if (info) {
             ssid = info[@"SSID"];
         }
+        CFRelease(interfaces);
     }
     
     return ssid;
@@ -603,7 +697,7 @@ NSString *const MGLEventGestureRotateStart = @"Rotation";
 
 // Can be called from any thread.
 //
-- (NSString *) getCurrentCellularNetworkConnectionType {
+- (NSString *) currentCellularNetworkConnectionType {
     CTTelephonyNetworkInfo *telephonyInfo = [[CTTelephonyNetworkInfo alloc] init];
     NSString *radioTech = telephonyInfo.currentRadioAccessTechnology;
     
@@ -668,13 +762,42 @@ NSString *const MGLEventGestureRotateStart = @"Rotation";
     return result;
 }
 
+#pragma mark CLLocationManagerDelegate
+- (void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray *)locations {
+    //  Iterate through locations to pass all data
+    for (CLLocation *loc in locations) {
+        [MGLMapboxEvents pushEvent:MGLEventTypeLocation withAttributes:@{
+            MGLEventKeyLatitude: @(loc.coordinate.latitude),
+            MGLEventKeyLongitude: @(loc.coordinate.longitude),
+            MGLEventKeySpeed: @(loc.speed),
+            MGLEventKeyCourse: @(loc.course),
+            MGLEventKeyAltitude: @(loc.altitude),
+            MGLEventKeyHorizontalAccuracy: @(loc.horizontalAccuracy),
+            MGLEventKeyVerticalAccuracy: @(loc.verticalAccuracy)
+        }];
+    }
+}
+
+- (void)locationManager:(CLLocationManager *)manager didVisit:(CLVisit *)visit {
+    [MGLMapboxEvents pushEvent:MGLEventTypeVisit withAttributes:@{
+        MGLEventKeyLatitude: @(visit.coordinate.latitude),
+        MGLEventKeyLongitude: @(visit.coordinate.longitude),
+        MGLEventKeyHorizontalAccuracy: @(visit.horizontalAccuracy),
+        MGLEventKeyArrivalDate: [[NSDate distantPast] isEqualToDate:visit.arrivalDate] ? [NSNull null] : [_rfc3339DateFormatter stringFromDate:visit.arrivalDate],
+        MGLEventKeyDepartureDate: [[NSDate distantFuture] isEqualToDate:visit.departureDate] ? [NSNull null] : [_rfc3339DateFormatter stringFromDate:visit.departureDate]
+    }];
+}
+
+- (void)locationManager:(CLLocationManager *)manager didChangeAuthorizationStatus:(CLAuthorizationStatus)status {
+    [self validateUpdatingLocation];
+}
+
 #pragma mark NSURLSessionDelegate
 - (void)URLSession:(NSURLSession *)session didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^) (NSURLSessionAuthChallengeDisposition disposition, NSURLCredential *credential))completionHandler {
 
     if([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) {
 
         SecTrustRef serverTrust = [[challenge protectionSpace] serverTrust];
-        NSString *domain = [[challenge protectionSpace] host];
         SecTrustResultType trustResult;
 
         // Validate the certificate chain with the device's trust store anyway
@@ -686,6 +809,7 @@ NSString *const MGLEventGestureRotateStart = @"Rotation";
             long numKeys = SecTrustGetCertificateCount(serverTrust);
 
             BOOL found = false;
+            // Try GeoTrust Cert First
             for (int lc = 0; lc < numKeys; lc++) {
                 SecCertificateRef certificate = SecTrustGetCertificateAtIndex(serverTrust, lc);
                 NSData *remoteCertificateData = CFBridgingRelease(SecCertificateCopyData(certificate));
@@ -700,8 +824,24 @@ NSString *const MGLEventGestureRotateStart = @"Rotation";
             }
 
             if (!found) {
-                // The certificate wasn't found in the certificate chain; cancel the connection
-                completionHandler(NSURLSessionAuthChallengeCancelAuthenticationChallenge, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]);
+                // Fallback to Digicert Cert
+                for (int lc = 0; lc < numKeys; lc++) {
+                    SecCertificateRef certificate = SecTrustGetCertificateAtIndex(serverTrust, lc);
+                    NSData *remoteCertificateData = CFBridgingRelease(SecCertificateCopyData(certificate));
+
+                    // Compare Remote Key With Local Version
+                    if ([remoteCertificateData isEqualToData:_digicertCert]) {
+                        // Found the certificate; continue connecting
+                        completionHandler(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]);
+                        found = true;
+                        break;
+                    }
+                }
+
+                if (!found) {
+                    // The certificate wasn't found in GeoTrust nor Digicert. Cancel the connection.
+                    completionHandler(NSURLSessionAuthChallengeCancelAuthenticationChallenge, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]);
+                }
             }
         }
         else
diff --git a/platform/ios/MGLMetricsLocationManager.m b/platform/ios/MGLMetricsLocationManager.m
deleted file mode 100644
index af9b0a71b..000000000
--- a/platform/ios/MGLMetricsLocationManager.m
+++ /dev/null
@@ -1,86 +0,0 @@
-#import "MGLMapboxEvents.h"
-#import "MGLMetricsLocationManager.h"
-
-#import <CoreLocation/CoreLocation.h>
-
-@interface MGLMetricsLocationManager() <CLLocationManagerDelegate>
-
-@property (nonatomic) CLLocationManager *locationManager;
-
-@end
-
-@implementation MGLMetricsLocationManager
-
-- (instancetype) init {
-    if (self = [super init]) {
-        _locationManager = [[CLLocationManager alloc] init];
-        _locationManager.distanceFilter = 10;
-        [_locationManager setDelegate:self];
-    }
-    return self;
-}
-
-+ (instancetype)sharedManager {
-    static dispatch_once_t onceToken;
-    static MGLMetricsLocationManager *sharedManager;
-    dispatch_once(&onceToken, ^{
-        sharedManager = [[self alloc] init];
-    });
-    return sharedManager;
-}
-
-+ (void) startUpdatingLocation {
-    [[MGLMetricsLocationManager sharedManager].locationManager startUpdatingLocation];
-}
-
-+ (void) stopUpdatingLocation {
-    [[MGLMetricsLocationManager sharedManager].locationManager stopUpdatingLocation];
-}
-
-#pragma mark CLLocationManagerDelegate
-- (void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray *)locations {
-    //  Iterate through locations to pass all data
-    for (CLLocation *loc in locations) {
-        [MGLMapboxEvents pushEvent:MGLEventTypeLocation withAttributes:@{
-            MGLEventKeyLatitude: @(loc.coordinate.latitude),
-            MGLEventKeyLongitude: @(loc.coordinate.longitude),
-            MGLEventKeySpeed: @(loc.speed),
-            MGLEventKeyCourse: @(loc.course),
-            MGLEventKeyAltitude: @(loc.altitude),
-            MGLEventKeyHorizontalAccuracy: @(loc.horizontalAccuracy),
-            MGLEventKeyVerticalAccuracy: @(loc.verticalAccuracy)
-        }];
-    }
-}
-
-- (void)locationManager:(CLLocationManager *)manager didChangeAuthorizationStatus:(CLAuthorizationStatus)status {
-    NSString *newStatus = nil;
-    switch (status) {
-        case kCLAuthorizationStatusNotDetermined:
-            newStatus = @"User Hasn't Determined Yet";
-            break;
-        case kCLAuthorizationStatusRestricted:
-            newStatus = @"Restricted and Can't Be Changed By User";
-            break;
-        case kCLAuthorizationStatusDenied:
-            newStatus = @"User Explcitly Denied";
-            [MGLMetricsLocationManager stopUpdatingLocation];
-            break;
-        case kCLAuthorizationStatusAuthorized:
-            newStatus = @"User Has Authorized / Authorized Always";
-            [MGLMetricsLocationManager startUpdatingLocation];
-            break;
-            //        case kCLAuthorizationStatusAuthorizedAlways:
-            //            newStatus = @"Not Determined";
-            //            break;
-        case kCLAuthorizationStatusAuthorizedWhenInUse:
-            newStatus = @"User Has Authorized When In Use Only";
-            [MGLMetricsLocationManager startUpdatingLocation];
-            break;
-        default:
-            newStatus = @"Unknown";
-            break;
-    }
-}
-
-@end
diff --git a/platform/ios/MGLTypes.m b/platform/ios/MGLTypes.m
new file mode 100644
index 000000000..01e9a1467
--- /dev/null
+++ b/platform/ios/MGLTypes.m
@@ -0,0 +1,3 @@
+#import "MGLTypes.h"
+
+NSString * const MGLErrorDomain = @"MGLErrorDomain";
diff --git a/platform/ios/MGLUserLocation.m b/platform/ios/MGLUserLocation.m
index 91e8e3010..cdeae3a9c 100644
--- a/platform/ios/MGLUserLocation.m
+++ b/platform/ios/MGLUserLocation.m
@@ -63,7 +63,7 @@
 
 - (NSString *)title
 {
-    return (_title ? _title : @"Current Location");
+    return (_title ? _title : @"You Are Here");
 }
 
 @end
diff --git a/platform/ios/NSBundle+MGLAdditions.h b/platform/ios/NSBundle+MGLAdditions.h
new file mode 100644
index 000000000..1fc0803b4
--- /dev/null
+++ b/platform/ios/NSBundle+MGLAdditions.h
@@ -0,0 +1,7 @@
+#import <Foundation/Foundation.h>
+
+@interface NSBundle (MGLAdditions)
+
++ (NSString *)mgl_resourceBundlePath;
+
+@end
diff --git a/platform/ios/NSBundle+MGLAdditions.m b/platform/ios/NSBundle+MGLAdditions.m
new file mode 100644
index 000000000..b0ecf4656
--- /dev/null
+++ b/platform/ios/NSBundle+MGLAdditions.m
@@ -0,0 +1,16 @@
+#import "NSBundle+MGLAdditions.h"
+
+#import "MGLMapView.h"
+
+@implementation NSBundle (MGLAdditions)
+
++ (NSString *)mgl_resourceBundlePath
+{
+    NSString *resourceBundlePath = [[NSBundle bundleForClass:[MGLMapView class]] pathForResource:@"MapboxGL" ofType:@"bundle"];
+
+    if ( ! resourceBundlePath) resourceBundlePath = [[NSBundle mainBundle] bundlePath];
+
+    return resourceBundlePath;
+}
+
+@end
diff --git a/platform/ios/NSException+MGLAdditions.h b/platform/ios/NSException+MGLAdditions.h
new file mode 100644
index 000000000..4d5de1511
--- /dev/null
+++ b/platform/ios/NSException+MGLAdditions.h
@@ -0,0 +1,3 @@
+#import <Foundation/Foundation.h>
+
+#define MGLAssertIsMainThread() NSAssert([[NSThread currentThread] isMainThread], @"-[%@ %@] must be accessed on the main thread, not %@", [self class], NSStringFromSelector(_cmd), [NSThread currentThread])
diff --git a/platform/ios/resources/Compass.png b/platform/ios/resources/Compass.png
index fd3afe6f6..e6b0b52c5 100644
Binary files a/platform/ios/resources/Compass.png and b/platform/ios/resources/Compass.png differ
diff --git a/platform/ios/resources/api_mapbox_com-digicert.der b/platform/ios/resources/api_mapbox_com-digicert.der
new file mode 100644
index 000000000..d84cee390
Binary files /dev/null and b/platform/ios/resources/api_mapbox_com-digicert.der differ
diff --git a/scripts/android/install.sh b/scripts/android/install.sh
new file mode 100755
index 000000000..fe2b81606
--- /dev/null
+++ b/scripts/android/install.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+mapbox_time "checkout_mason" \
+git submodule update --init .mason
+
+export MASON_PLATFORM=android
+export MASON_ANDROID_ABI=${ANDROID_ABI}
+
+mapbox_time "android_toolchain" \
+./scripts/android/toolchain.sh
diff --git a/scripts/android/run.sh b/scripts/android/run.sh
new file mode 100755
index 000000000..38749f79f
--- /dev/null
+++ b/scripts/android/run.sh
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+BUILDTYPE=${BUILDTYPE:-Release}
+TESTMUNK=${TESTMUNK:-no}
+export HOST=android
+export MASON_PLATFORM=android
+export MASON_ANDROID_ABI=${ANDROID_ABI:-arm-v7}
+
+# Add Mason to PATH
+export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason"
+
+################################################################################
+# Build
+################################################################################
+
+mapbox_time "checkout_styles" \
+git submodule update --init styles
+
+mkdir -p ./android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw
+echo "${MAPBOX_ACCESS_TOKEN}" > ./android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt
+
+mapbox_time "compile_library" \
+make android-lib -j${JOBS} BUILDTYPE=${BUILDTYPE}
+
+mapbox_time "build_apk" \
+make android -j${JOBS} BUILDTYPE=${BUILDTYPE}
+
+################################################################################
+# Deploy
+################################################################################
+
+if [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then
+    # Install and add awscli to PATH for uploading the results
+    mapbox_time "install_awscli" \
+    pip install --user awscli
+    export PATH="`python -m site --user-base`/bin:${PATH}"
+
+    mapbox_time_start "deploy_results"
+    echo "Deploying results..."
+
+    S3_PREFIX=s3://mapbox/mapbox-gl-native/android/build/${TRAVIS_JOB_NUMBER}
+    APK_OUTPUTS=./android/java/MapboxGLAndroidSDKTestApp/build/outputs/apk
+
+    # Upload either the debug or the release build
+    if [ ${BUILDTYPE} == "Debug" ] ; then
+        aws s3 cp \
+            ${APK_OUTPUTS}/MapboxGLAndroidSDKTestApp-debug.apk \
+            ${S3_PREFIX}/MapboxGLAndroidSDKTestApp-debug.apk
+    elif [ ${BUILDTYPE} == "Release" ] ; then
+        aws s3 cp \
+            ${APK_OUTPUTS}/MapboxGLAndroidSDKTestApp-release-unsigned.apk \
+            ${S3_PREFIX}/MapboxGLAndroidSDKTestApp-release-unsigned.apk
+    fi
+
+    mapbox_time_finish
+fi
diff --git a/scripts/android/toolchain.sh b/scripts/android/toolchain.sh
new file mode 100755
index 000000000..67cd0aa47
--- /dev/null
+++ b/scripts/android/toolchain.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+export MASON_PLATFORM=android
+export MASON_ANDROID_ABI=${MASON_ANDROID_ABI:-arm-v7}
+export PATH="`pwd`/.mason:${PATH}"
+export MASON_DIR="`pwd`/.mason"
+
+export PATH=`mason env PATH`
+
+echo MASON_PLATFORM=\"${MASON_PLATFORM}\"
+echo MASON_ANDROID_ABI=\"${MASON_ANDROID_ABI}\"
+echo CXX=\"`which $(mason env CXX)`\"
+echo CC=\"`which $(mason env CC)`\"
+echo LD=\"`which $(mason env LD)`\"
+echo LINK=\"`which $(mason env CXX)`\"
+echo AR=\"`which $(mason env AR)`\"
+echo RANLIB=\"`which $(mason env RANLIB)`\"
+echo STRIP=\"`which $(mason env STRIP)`\"
+echo LDFLAGS=\"`mason env LDFLAGS` \${LDFLAGS:-}\"
+echo CFLAGS=\"`mason env CFLAGS` \${CFLAGS:-}\"
+echo CXXFLAGS=\"`mason env CXXFLAGS` \${CXXFLAGS:-}\"
+echo CPPFLAGS=\"`mason env CPPFLAGS` \${CPPFLAGS:-}\"
+echo JNIDIR=\"`mason env JNIDIR`\"
diff --git a/scripts/android_env.sh b/scripts/android_env.sh
deleted file mode 100755
index 93b1452a5..000000000
--- a/scripts/android_env.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -o pipefail
-
-./scripts/local_mason.sh
-
-export MASON_PLATFORM=android
-
-export PATH=`.mason/mason env PATH`
-
-echo MASON_PLATFORM=\"android\"
-echo MASON_ANDROID_ABI=\"${MASON_ANDROID_ABI}\"
-
-echo CXX=\"`which $(.mason/mason env CXX)`\"
-echo CC=\"`which $(.mason/mason env CC)`\"
-echo LD=\"`which $(.mason/mason env LD)`\"
-echo LINK=\"`which $(.mason/mason env CXX)`\"
-echo AR=\"`which $(.mason/mason env AR)`\"
-echo RANLIB=\"`which $(.mason/mason env RANLIB)`\"
-echo STRIP=\"`which $(.mason/mason env STRIP)`\"
-echo LDFLAGS=\"`.mason/mason env LDFLAGS` ${LDFLAGS}\"
-echo CFLAGS=\"`.mason/mason env CFLAGS` ${CFLAGS}\"
-echo CPPFLAGS=\"`.mason/mason env CPPFLAGS` ${CPPFLAGS}\"
-echo JNIDIR=\"`.mason/mason env JNIDIR`\"
diff --git a/scripts/compare_images.sh b/scripts/compare_images.sh
index f9e1a81ed..240772646 100755
--- a/scripts/compare_images.sh
+++ b/scripts/compare_images.sh
@@ -3,4 +3,4 @@
 set -e
 set -o pipefail
 
-(cd ./test/suite/ && (./bin/compare_images.py || true))
+(cd ./test/suite/ && ./bin/compare_images.py native)
diff --git a/scripts/flags.sh b/scripts/flags.sh
deleted file mode 100755
index 10cc88e5c..000000000
--- a/scripts/flags.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-
-if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
-    export DISPLAY=:99.0
-
-    if [[ ${MASON_PLATFORM} != "android" ]]; then
-        sh -e /etc/init.d/xvfb start
-    fi
-
-    # use g++ that supports c++11
-    if [[ ${CXX} == "g++" ]]; then
-        export CXX="g++-4.8"
-        export CC="gcc-4.8"
-    fi
-
-    # If building in debug then turn on sanitizers.
-    # They should both work with latest g++/clang++
-    # but it's not worth a standalone matrix so here
-    # we just test address->gcc and thread->clang for
-    # some limited coverage
-    # if [[ ${BUILDTYPE} == "Debug" ]]; then
-    #     if [[ ${CXX} == "g++" ]]; then
-    #         export CXXFLAGS="-fsanitize=address -g ${CXXFLAGS}"
-    #         export CFLAGS="-fsanitize=address -g ${CFLAGS}"
-    #         export LDFLAGS="-fsanitize=address  ${LDFLAGS}"
-    #     elif [[ ${CXX} == "clang++" ]]; then
-    #         export CXXFLAGS="-fsanitize=thread -g -fPIC ${CXXFLAGS}"
-    #         export CFLAGS="-fsanitize=thread -g ${CFLAGS}"
-    #         export LDFLAGS="-fsanitize=thread -pie ${LDFLAGS}"
-    #     fi
-    # fi
-fi
diff --git a/scripts/install_node.sh b/scripts/install_node.sh
deleted file mode 100755
index ecb5b8835..000000000
--- a/scripts/install_node.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-mason install node 0.10.35
-export PATH="`mason prefix node 0.10.35`/bin":"$PATH"
diff --git a/scripts/ios_travis/add-key.sh b/scripts/ios/add-key.sh
similarity index 61%
rename from scripts/ios_travis/add-key.sh
rename to scripts/ios/add-key.sh
index b58144530..fe963d38e 100755
--- a/scripts/ios_travis/add-key.sh
+++ b/scripts/ios/add-key.sh
@@ -16,10 +16,10 @@ security unlock-keychain -p travis ios-build.keychain
 security set-keychain-settings -t 3600 -l ~/Library/Keychains/ios-build.keychain
 
 # Add certificates to keychain and allow codesign to access them
-security import ./scripts/ios_travis/apple.crt    -k ~/Library/Keychains/ios-build.keychain -T /usr/bin/codesign
-security import ./scripts/ios_travis/ios-dist.cer -k ~/Library/Keychains/ios-build.keychain -T /usr/bin/codesign
-security import ./scripts/ios_travis/ios-dist.p12 -k ~/Library/Keychains/ios-build.keychain -P $IOS_KEY_PASSWORD -T /usr/bin/codesign
+security import ./scripts/ios/apple.crt    -k ~/Library/Keychains/ios-build.keychain -T /usr/bin/codesign
+security import ./scripts/ios/ios-dist.cer -k ~/Library/Keychains/ios-build.keychain -T /usr/bin/codesign
+security import ./scripts/ios/ios-dist.p12 -k ~/Library/Keychains/ios-build.keychain -P $IOS_KEY_PASSWORD -T /usr/bin/codesign
 
 # Put the provisioning profile in place
 mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
-cp "./scripts/ios_travis/$IOS_PROFILE_NAME.mobileprovision" ~/Library/MobileDevice/Provisioning\ Profiles/
+cp "./scripts/ios/$IOS_PROFILE_NAME.mobileprovision" ~/Library/MobileDevice/Provisioning\ Profiles/
diff --git a/scripts/ios_travis/upload_screenshots.sh b/scripts/ios/after_failure.sh
similarity index 100%
rename from scripts/ios_travis/upload_screenshots.sh
rename to scripts/ios/after_failure.sh
diff --git a/scripts/ios_travis/apple.crt b/scripts/ios/apple.crt
similarity index 100%
rename from scripts/ios_travis/apple.crt
rename to scripts/ios/apple.crt
diff --git a/scripts/ios/benchmark.sh b/scripts/ios/benchmark.sh
new file mode 100755
index 000000000..1c342e653
--- /dev/null
+++ b/scripts/ios/benchmark.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+set -u
+
+if [ -z "$(which ios-deploy)" ] ; then
+    npm install -g ios-deploy
+fi
+
+(cd ios/benchmark/assets/tiles && ./download.sh)
+(cd ios/benchmark/assets/glyphs && ./download.sh)
+
+make ibench
+
+ios-deploy --debug --noninteractive --bundle "gyp/build/Release-iphoneos/Bench GL.app"
diff --git a/scripts/ios/install.sh b/scripts/ios/install.sh
new file mode 100755
index 000000000..ffa714f36
--- /dev/null
+++ b/scripts/ios/install.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+mapbox_time "checkout_mason" \
+git submodule update --init .mason
+
+mapbox_time "install_xcpretty" \
+gem install xcpretty --no-rdoc --no-ri --no-document --quiet
+
+mapbox_time "install_recent_git" \
+brew install git
+
+mapbox_time "install_awscli" \
+brew install awscli
+
+mkdir -p ${KIF_SCREENSHOTS}
diff --git a/scripts/ios_travis/ios-dist.cer.enc b/scripts/ios/ios-dist.cer.enc
similarity index 100%
rename from scripts/ios_travis/ios-dist.cer.enc
rename to scripts/ios/ios-dist.cer.enc
diff --git a/scripts/ios_travis/ios-dist.p12.enc b/scripts/ios/ios-dist.p12.enc
similarity index 100%
rename from scripts/ios_travis/ios-dist.p12.enc
rename to scripts/ios/ios-dist.p12.enc
diff --git a/scripts/ios_travis/ios-in-house.mobileprovision.enc b/scripts/ios/ios-in-house.mobileprovision.enc
similarity index 100%
rename from scripts/ios_travis/ios-in-house.mobileprovision.enc
rename to scripts/ios/ios-in-house.mobileprovision.enc
diff --git a/scripts/ios/package.sh b/scripts/ios/package.sh
new file mode 100755
index 000000000..35162ce5d
--- /dev/null
+++ b/scripts/ios/package.sh
@@ -0,0 +1,121 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+set -u
+
+NAME=MapboxGL
+OUTPUT=build/ios/pkg
+IOS_SDK_VERSION=`xcrun --sdk iphoneos --show-sdk-version`
+LIBUV_VERSION=0.10.28
+
+if [[ ${#} -eq 0 ]]; then
+    BUILD_FOR_DEVICE=true
+else
+    BUILD_FOR_DEVICE=false
+fi
+
+function step { >&2 echo -e "\033[1m\033[36m* $@\033[0m"; }
+function finish { >&2 echo -en "\033[0m"; }
+trap finish EXIT
+
+
+rm -rf ${OUTPUT}
+mkdir -p "${OUTPUT}"/static
+
+
+step "Recording library version..."
+VERSION="${OUTPUT}"/static/version.txt
+echo -n "https://github.com/mapbox/mapbox-gl-native/commit/" > ${VERSION}
+HASH=`git log | head -1 | awk '{ print $2 }' | cut -c 1-10` && true
+echo -n "mapbox-gl-native "
+echo ${HASH}
+echo ${HASH} >> ${VERSION}
+
+
+step "Creating build files..."
+export MASON_PLATFORM=ios
+export BUILDTYPE=${BUILDTYPE:-Release}
+export HOST=ios
+make Xcode/ios
+
+if [[ "${BUILD_FOR_DEVICE}" == true ]]; then
+    step "Building iOS device targets..."
+    xcodebuild -sdk iphoneos${IOS_SDK_VERSION} \
+        ARCHS="arm64 armv7 armv7s" \
+        ONLY_ACTIVE_ARCH=NO \
+        -project ./build/ios/mbgl.xcodeproj \
+        -configuration ${BUILDTYPE} \
+        -target everything \
+        -jobs ${JOBS} | xcpretty -c
+fi
+
+step "Building iOS Simulator targets..."
+xcodebuild -sdk iphonesimulator${IOS_SDK_VERSION} \
+    ARCHS="x86_64 i386" \
+    ONLY_ACTIVE_ARCH=NO \
+    -project ./build/ios/mbgl.xcodeproj \
+    -configuration ${BUILDTYPE} \
+    -target everything \
+    -jobs ${JOBS} | xcpretty -c
+
+
+step "Building static library..."
+LIBS=(core.a platform-ios.a asset-fs.a cache-sqlite.a http-nsurl.a)
+if [[ "${BUILD_FOR_DEVICE}" == true ]]; then
+    libtool -static -no_warning_for_no_symbols \
+        -o ${OUTPUT}/static/lib${NAME}.a \
+        ${LIBS[@]/#/build/${BUILDTYPE}-iphoneos/libmbgl-} \
+        ${LIBS[@]/#/build/${BUILDTYPE}-iphonesimulator/libmbgl-} \
+        `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libuv.a`
+else
+    libtool -static -no_warning_for_no_symbols \
+        -o ${OUTPUT}/static/lib${NAME}.a \
+        ${LIBS[@]/#/build/${BUILDTYPE}-iphonesimulator/libmbgl-} \
+        `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libuv.a`
+fi
+echo "Created ${OUTPUT}/static/lib${NAME}.a"
+
+
+step "Copying Headers..."
+mkdir -p "${OUTPUT}/static/Headers"
+for i in `ls -R include/mbgl/ios | grep -vi private`; do
+    cp -pv include/mbgl/ios/$i "${OUTPUT}/static/Headers"
+done
+
+step "Setting up dummy source file for CocoaPods 0.37.0..."
+echo "// https://github.com/mapbox/mapbox-gl-native/issues/1426" > "${OUTPUT}/static/MGLDummy.m"
+
+
+# Manually create resource bundle. We don't use a GYP target here because of
+# complications between faked GYP bundles-as-executables, device build
+# dependencies, and code signing.
+step "Copying Resources..."
+cp -pv LICENSE.md "${OUTPUT}/static"
+mkdir -p "${OUTPUT}/static/${NAME}.bundle"
+cp -pv platform/ios/resources/* "${OUTPUT}/static/${NAME}.bundle"
+cp -prv styles/styles "${OUTPUT}/static/${NAME}.bundle/styles"
+
+step "Creating API Docs..."
+if [ -z `which appledoc` ]; then
+    echo "Unable to find appledoc. Consider installing it from source or Homebrew."
+    exit 1
+fi
+DOCS_OUTPUT="${OUTPUT}/static/Docs"
+DOCS_VERSION=$( git tag -l ios\* --sort -v:refname | sed -n '1p' | sed 's/ios-v//' )
+README="/tmp/GL-README.md"
+cat ios/README.md > ${README}
+echo >> ${README}
+echo -n "#" >> ${README}
+cat CHANGELOG.md >> ${README}
+appledoc \
+    --output ${DOCS_OUTPUT} \
+    --project-name "Mapbox GL for iOS ${DOCS_VERSION}" \
+    --project-company Mapbox \
+    --create-html \
+    --no-create-docset \
+    --no-install-docset \
+    --company-id com.mapbox \
+    --ignore include/mbgl/ios/private \
+    --index-desc ${README} \
+    include/mbgl/ios
diff --git a/scripts/publish_ios.sh b/scripts/ios/publish.sh
similarity index 100%
rename from scripts/publish_ios.sh
rename to scripts/ios/publish.sh
diff --git a/scripts/ios_travis/remove-key.sh b/scripts/ios/remove-key.sh
similarity index 100%
rename from scripts/ios_travis/remove-key.sh
rename to scripts/ios/remove-key.sh
diff --git a/scripts/ios/run.sh b/scripts/ios/run.sh
new file mode 100755
index 000000000..dbf785081
--- /dev/null
+++ b/scripts/ios/run.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+set -u
+
+source ./scripts/ios/setup.sh
+
+BUILDTYPE=${BUILDTYPE:-Release}
+
+PUBLISH_TAG=($(git show -s --format=%B | sed -n 's/.*\[publish \([a-z]\{1,\}\)-v\([0-9.]\{1,\}\)\].*/\1 \2/p'))
+PUBLISH_PLATFORM=${PUBLISH_TAG[0],-}
+PUBLISH_VERSION=${PUBLISH_TAG[1],-}
+
+
+################################################################################
+# Build
+################################################################################
+
+if [[ ${PUBLISH_PLATFORM} = 'ios' ]]; then
+    # build & package iOS
+    mapbox_time "package_ios" \
+    make ipackage
+
+    # publish iOS build
+    mapbox_time "deploy_ios" \
+    ./scripts/ios/publish.sh "${PUBLISH_VERSION}"
+else
+    # build & test iOS
+    mapbox_time "run_ios_tests" \
+    make ipackage-sim
+fi
diff --git a/scripts/ios/setup.sh b/scripts/ios/setup.sh
new file mode 100644
index 000000000..d115cf902
--- /dev/null
+++ b/scripts/ios/setup.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# This script is sourced; do not set -e or -o pipefail here.
+
+# Ensure mason is on the PATH
+export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason"
diff --git a/scripts/test_ios.sh b/scripts/ios/test.sh
similarity index 100%
rename from scripts/test_ios.sh
rename to scripts/ios/test.sh
diff --git a/scripts/linux/after_script.sh b/scripts/linux/after_script.sh
new file mode 100755
index 000000000..c38af0a79
--- /dev/null
+++ b/scripts/linux/after_script.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+if [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then
+    # Install and add awscli to PATH for uploading the results
+    mapbox_time "install_awscli" \
+    pip install --user awscli
+    export PATH="`python -m site --user-base`/bin:${PATH}"
+
+    mapbox_time_start "deploy_results"
+    (cd ./test/suite/ && ./bin/deploy_results.sh)
+    mapbox_time_finish
+fi
diff --git a/scripts/linux/install.sh b/scripts/linux/install.sh
new file mode 100755
index 000000000..a254d312e
--- /dev/null
+++ b/scripts/linux/install.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+mapbox_time "checkout_mason" \
+git submodule update --init .mason
+
+PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" \
+mapbox_time "install_mesa" \
+mason install mesa 10.4.3
diff --git a/scripts/linux/run.sh b/scripts/linux/run.sh
new file mode 100755
index 000000000..42d2a16d9
--- /dev/null
+++ b/scripts/linux/run.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+source ./scripts/linux/setup.sh
+
+BUILDTYPE=${BUILDTYPE:-Release}
+
+################################################################################
+# Build
+################################################################################
+
+mapbox_time "checkout_styles" \
+git submodule update --init styles
+
+mapbox_time "compile_program" \
+make linux -j${JOBS} BUILDTYPE=${BUILDTYPE}
+
+mapbox_time "compile_render_binary" \
+make render -j${JOBS} BUILDTYPE=${BUILDTYPE}
+
+mapbox_time "compile_tests" \
+make test -j${JOBS} BUILDTYPE=${BUILDTYPE}
+
+################################################################################
+# Test
+################################################################################
+
+mapbox_time "checkout_test_suite" \
+git submodule update --init test/suite
+
+mapbox_time "run_tests" \
+make test-* BUILDTYPE=${BUILDTYPE}
+
+mapbox_time "compare_results" \
+./scripts/compare_images.sh
diff --git a/scripts/linux/setup.sh b/scripts/linux/setup.sh
new file mode 100755
index 000000000..af0eafb5c
--- /dev/null
+++ b/scripts/linux/setup.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+# This script is sourced; do not set -e or -o pipefail here.
+
+# Ensure mason is on the PATH
+export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason"
+
+# Set the core file limit to unlimited so a core file is generated upon crash
+ulimit -c unlimited -S
+
+################################################################################
+# X Server setup
+################################################################################
+
+# Start the mock X server
+if [ -f /etc/init.d/xvfb ] ; then
+    mapbox_time "start_xvfb" \
+    sh -e /etc/init.d/xvfb start
+    sleep 2 # sometimes, xvfb takes some time to start up
+fi
+
+# Make sure we're connecting to xvfb
+export DISPLAY=:99.0
+
+# Make sure we're loading the 10.4.3 libs we installed manually
+export LD_LIBRARY_PATH="`mason prefix mesa 10.4.3`/lib:${LD_LIBRARY_PATH:-}"
+
+mapbox_time "glxinfo" \
+glxinfo
diff --git a/scripts/local_mason.sh b/scripts/local_mason.sh
deleted file mode 100755
index 2d8687a28..000000000
--- a/scripts/local_mason.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-git submodule update --init .mason
-PATH=`pwd`/.mason:$PATH
-export MASON_DIR=`pwd`/.mason
diff --git a/scripts/npm_install.sh b/scripts/npm_install.sh
deleted file mode 100755
index 7437af961..000000000
--- a/scripts/npm_install.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -o pipefail
-
-cd bin
-$1 install --clang=1
-cd ../
diff --git a/scripts/osx/install.sh b/scripts/osx/install.sh
new file mode 100755
index 000000000..d6d9c065c
--- /dev/null
+++ b/scripts/osx/install.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+mapbox_time "checkout_mason" \
+git submodule update --init .mason
+
+mapbox_time "install_xcpretty" \
+gem install xcpretty --no-rdoc --no-ri --no-document --quiet
diff --git a/scripts/osx/run.sh b/scripts/osx/run.sh
new file mode 100755
index 000000000..70d54c5ce
--- /dev/null
+++ b/scripts/osx/run.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+source ./scripts/osx/setup.sh
+
+BUILDTYPE=${BUILDTYPE:-Release}
+
+################################################################################
+# Build
+################################################################################
+
+mapbox_time "checkout_styles" \
+git submodule update --init styles
+
+mapbox_time "compile_program" \
+make xosx -j${JOBS} BUILDTYPE=${BUILDTYPE}
+
+mapbox_time "compile_render_binary" \
+make xrender -j${JOBS} BUILDTYPE=${BUILDTYPE}
+
+mapbox_time "compile_tests" \
+make xtest -j${JOBS} BUILDTYPE=${BUILDTYPE}
diff --git a/scripts/osx/setup.sh b/scripts/osx/setup.sh
new file mode 100755
index 000000000..502d61d44
--- /dev/null
+++ b/scripts/osx/setup.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+# This script is sourced; do not set -e or -o pipefail here.
+
+# Ensure mason is on the PATH
+export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason"
+
+# Set the core file limit to unlimited so a core file is generated upon crash
+ulimit -c unlimited -S
diff --git a/scripts/package_ios.sh b/scripts/package_ios.sh
deleted file mode 100755
index 07e568faa..000000000
--- a/scripts/package_ios.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -o pipefail
-set -u
-
-NAME=MapboxGL
-OUTPUT=build/ios/pkg
-IOS_SDK_VERSION=`xcrun --sdk iphoneos --show-sdk-version`
-LIBUV_VERSION=0.10.28
-
-function step { >&2 echo -e "\033[1m\033[36m* $@\033[0m"; }
-function finish { >&2 echo -en "\033[0m"; }
-trap finish EXIT
-
-
-rm -rf ${OUTPUT}
-mkdir -p "${OUTPUT}"/static
-
-
-step "Recording library version..."
-VERSION="${OUTPUT}"/static/version.txt
-echo -n "https://github.com/mapbox/mapbox-gl-native/commit/" > ${VERSION}
-HASH=`git log | head -1 | awk '{ print $2 }' | cut -c 1-10` && true
-echo -n "mapbox-gl-native "
-echo ${HASH}
-echo ${HASH} >> ${VERSION}
-
-
-step "Creating build files..."
-export MASON_PLATFORM=ios
-export BUILDTYPE=${BUILDTYPE:-Release}
-export HOST=ios
-make Xcode/ios
-
-step "Building iOS device targets..."
-xcodebuild -sdk iphoneos${IOS_SDK_VERSION} \
-    ARCHS="arm64 armv7 armv7s" \
-    ONLY_ACTIVE_ARCH=NO \
-    -project ./build/ios/mbgl.xcodeproj \
-    -configuration ${BUILDTYPE} \
-    -target everything \
-    -jobs `sysctl -n hw.ncpu` | xcpretty -c
-
-
-step "Building iOS Simulator targets..."
-xcodebuild -sdk iphonesimulator${IOS_SDK_VERSION} \
-    ARCHS="x86_64 i386" \
-    ONLY_ACTIVE_ARCH=NO \
-    -project ./build/ios/mbgl.xcodeproj \
-    -configuration ${BUILDTYPE} \
-    -target everything \
-    -jobs `sysctl -n hw.ncpu` | xcpretty -c
-
-
-step "Building static library..."
-LIBS=(core.a platform-ios.a asset-fs.a cache-sqlite.a http-nsurl.a)
-libtool -static -no_warning_for_no_symbols \
-    -o ${OUTPUT}/static/lib${NAME}.a \
-    ${LIBS[@]/#/build/${BUILDTYPE}-iphoneos/libmbgl-} \
-    ${LIBS[@]/#/build/${BUILDTYPE}-iphonesimulator/libmbgl-} \
-    `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libuv.a`
-echo "Created ${OUTPUT}/static/lib${NAME}.a"
-
-
-step "Copying Headers..."
-mkdir -p "${OUTPUT}/static/Headers"
-cp -pv include/mbgl/ios/* "${OUTPUT}/static/Headers"
-
-
-# Manually create resource bundle. We don't use a GYP target here because of
-# complications between faked GYP bundles-as-executables, device build
-# dependencies, and code signing.
-step "Copying Resources..."
-cp -pv LICENSE.md "${OUTPUT}/static"
-mkdir -p "${OUTPUT}/static/${NAME}.bundle"
-cp -pv platform/ios/resources/* "${OUTPUT}/static/${NAME}.bundle"
-cp -prv styles/styles "${OUTPUT}/static/${NAME}.bundle/styles"
diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
deleted file mode 100755
index f837e7416..000000000
--- a/scripts/travis_before_install.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -o pipefail
-
-if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
-    #
-    # install Linux dependencies
-    #
-    if [[ `lsb_release -r` =~ "12.04" ]]; then
-        sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
-    fi
-    sudo add-apt-repository --yes ppa:boost-latest/ppa
-
-    mapbox_time "apt_update" \
-    sudo apt-get update -y
-
-    mapbox_time "install_gcc" \
-    sudo apt-get -y install gcc-4.8 g++-4.8
-
-    mapbox_time "install_build_tools" \
-    sudo apt-get -y install git build-essential zlib1g-dev automake gdb \
-                            libtool xutils-dev make cmake pkg-config python-pip \
-                            libboost1.55-dev libcurl4-openssl-dev \
-                            libpng-dev libsqlite3-dev
-
-    if [[ ${MASON_PLATFORM} != "android" ]]; then
-        mapbox_time "install_opengl" \
-        sudo apt-get -y install mesa-utils libxi-dev x11proto-randr-dev \
-                                x11proto-xext-dev libxrandr-dev \
-                                x11proto-xf86vidmode-dev libxxf86vm-dev \
-                                libxcursor-dev libxinerama-dev \
-                                llvm-3.4 # required for mesa
-
-        mapbox_time "install_mesa" \
-        mason install mesa 10.4.3
-    fi
-
-    mapbox_time "install_awscli" \
-    sudo pip install awscli
-elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then
-    #
-    # install OS X dependencies
-    #
-    mapbox_time "install_build_tools" \
-    brew install git
-
-    mapbox_time "install_awscli" \
-    sudo pip install awscli
-
-    mapbox_time "install_xcpretty" \
-    gem install xcpretty --no-rdoc --no-ri --no-document --quiet
-fi
diff --git a/scripts/travis_helper.sh b/scripts/travis_helper.sh
index c42ce215e..5a765b131 100755
--- a/scripts/travis_helper.sh
+++ b/scripts/travis_helper.sh
@@ -1,13 +1,25 @@
 #!/usr/bin/env bash
 
+# This script is sourced, so do not set -e or -o pipefail here. Doing so would
+# bleed into Travis' wrapper script, which messes with their workflow, e.g.
+# preventing after_failure scripts to be triggered.
+
+case `uname -s` in
+    'Darwin') JOBS=$((`sysctl -n hw.ncpu` + 2)) ;;
+    'Linux')  JOBS=$((`nproc` + 2)) ;;
+    *)        JOBS=2 ;;
+esac
+
+ANSI_CLEAR="\e[0m"
+
 function mapbox_time_start {
     local name=$1
     mapbox_timer_name=$name
 
-    travis_fold start $name
+    mapbox_fold start $name
 
     mapbox_timer_id=$(printf %08x $(( RANDOM * RANDOM )))
-    eval "mapbox_start_time_$mapbox_timer_id=$(travis_nanoseconds)"
+    eval "mapbox_start_time_$mapbox_timer_id=$(mapbox_nanoseconds)"
     echo -en "travis_time:start:$mapbox_timer_id\n"
 }
 
@@ -16,11 +28,11 @@ function mapbox_time_finish {
     local timer_id=${2:-$mapbox_timer_id}
     local timer_start="mapbox_start_time_$timer_id"
     eval local start_time=\${$timer_start}
-    local end_time=$(travis_nanoseconds)
+    local end_time=$(mapbox_nanoseconds)
     local duration=$(($end_time-$start_time))
     echo -en "travis_time:end:$timer_id:start=$start_time,finish=$end_time,duration=$duration\n"
 
-    travis_fold end $name
+    mapbox_fold end $name
 }
 
 function mapbox_time {
@@ -32,13 +44,13 @@ function mapbox_time {
     mapbox_time_finish $name $timer_id
 }
 
-if [[ "${TRAVIS_COMMIT:-false}" == false ]]; then
-function travis_fold {
+function mapbox_fold {
   local action=$1
   local name=$2
   echo -en "travis_fold:${action}:${name}\r${ANSI_CLEAR}"
 }
-function travis_nanoseconds {
+
+function mapbox_nanoseconds {
   local cmd="date"
   local format="+%s%N"
   local os=$(uname)
@@ -51,11 +63,11 @@ function travis_nanoseconds {
 
   $cmd -u $format
 }
-fi
 
+export JOBS
 export ANSI_CLEAR
-export -f travis_fold
-export -f travis_nanoseconds
+export -f mapbox_fold
+export -f mapbox_nanoseconds
 export -f mapbox_time
 export -f mapbox_time_start
 export -f mapbox_time_finish
diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh
deleted file mode 100755
index 093b31273..000000000
--- a/scripts/travis_script.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/env bash
-
-COMMIT_MESSAGE=$(git show -s --format=%B $1 | tr -d '\n')
-PUBLISH_TAG=$(echo "$COMMIT_MESSAGE" | grep -oE '\[publish [a-z0-9\.\-]+\]' | grep -oE '[a-z0-9\.\-]+' | tail -n1)
-PUBLISH_PLATFORM=$(echo "$PUBLISH_TAG" | awk -F '-v' '{ print $1 }')
-PUBLISH_VERSION=$(echo "$PUBLISH_TAG" | awk -F '-v' '{ print $2 }')
-
-set -e
-set -o pipefail
-
-mapbox_time "checkout_styles" \
-git submodule update --init styles
-
-if [[ $MASON_PLATFORM == "android" ]]; then
-    ./android/scripts/run-build.sh
-
-elif [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
-    #
-    # build & test Linux
-    #
-    mapbox_time "compile_program" \
-    make linux -j$JOBS BUILDTYPE=${BUILDTYPE}
-
-    mapbox_time "compile_tests" \
-    make test -j$JOBS BUILDTYPE=${BUILDTYPE}
-
-    mapbox_time "checkout_test_suite" \
-    git submodule update --init test/suite
-
-    mapbox_time "run_tests" \
-    make test-* BUILDTYPE=${BUILDTYPE}
-
-    mapbox_time "compare_results" \
-    ./scripts/compare_images.sh
-
-    if [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then
-        mapbox_time_start "deploy_results"
-        (cd ./test/suite/ && ./bin/deploy_results.sh)
-        mapbox_time_finish
-    fi
-
-elif [[ ${TRAVIS_OS_NAME} == "osx" && ${MASON_PLATFORM} == "osx" ]]; then
-    #
-    # build OS X
-    #
-    mapbox_time "build_osx" \
-    make xosx -j$JOBS
-
-elif [[ ${TRAVIS_OS_NAME} == "osx" && ${MASON_PLATFORM} == "ios" ]]; then
-    #
-    # conditionally publish or test
-    #
-    if [[ -n "$PUBLISH_TAG" ]]; then
-        #
-        # build & package iOS
-        #
-        mapbox_time "package_ios"
-        make ipackage
-        #
-        # publish iOS build
-        #
-        mapbox_time "deploy_ios"
-        ./scripts/publish_ios.sh "$PUBLISH_VERSION"
-    else
-        #
-        # build & test iOS
-        #
-        mapbox_time "run_ios_tests"
-        make itest
-    fi
-fi
diff --git a/scripts/xcpretty.sh b/scripts/xcpretty.sh
new file mode 100755
index 000000000..c39f58822
--- /dev/null
+++ b/scripts/xcpretty.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+FN=$(which xcpretty) ; [ ! -z ${FN} ] && echo "| ${FN}"
diff --git a/src/mbgl/geometry/binpack.hpp b/src/mbgl/geometry/binpack.hpp
index 9aadaa202..504417f45 100644
--- a/src/mbgl/geometry/binpack.hpp
+++ b/src/mbgl/geometry/binpack.hpp
@@ -23,7 +23,11 @@ public:
             if (width <= ref.w && height <= ref.h) {
                 if (smallest == free.end() || (ref.y <= rect.y && ref.x <= rect.x)) {
                     smallest = it;
+                } else {
+                    // Our current "smallest" rect is already closer to 0/0.
                 }
+            } else {
+                // The rect in the free list is not big enough.
             }
         }
 
diff --git a/src/mbgl/geometry/buffer.hpp b/src/mbgl/geometry/buffer.hpp
index 4198425ec..7e3ced442 100644
--- a/src/mbgl/geometry/buffer.hpp
+++ b/src/mbgl/geometry/buffer.hpp
@@ -2,6 +2,7 @@
 #define MBGL_GEOMETRY_BUFFER
 
 #include <mbgl/platform/gl.hpp>
+#include <mbgl/platform/log.hpp>
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/map/environment.hpp>
 
@@ -38,17 +39,16 @@ public:
     }
 
     // Transfers this buffer to the GPU and binds the buffer to the GL context.
-    void bind(bool force = false) {
-        if (buffer == 0) {
+    void bind() {
+        if (buffer) {
+            MBGL_CHECK_ERROR(glBindBuffer(bufferType, buffer));
+        } else {
             MBGL_CHECK_ERROR(glGenBuffers(1, &buffer));
-            force = true;
-        }
-        MBGL_CHECK_ERROR(glBindBuffer(bufferType, buffer));
-        if (force) {
+            MBGL_CHECK_ERROR(glBindBuffer(bufferType, buffer));
             if (array == nullptr) {
-                throw std::runtime_error("Buffer was already deleted or doesn't contain elements");
+                Log::Debug(Event::OpenGL, "Buffer doesn't contain elements");
+                pos = 0;
             }
-
             MBGL_CHECK_ERROR(glBufferData(bufferType, pos, array, GL_STATIC_DRAW));
             if (!retainAfterUpload) {
                 cleanup();
@@ -67,6 +67,13 @@ public:
         return buffer;
     }
 
+    // Uploads the buffer to the GPU to be available when we need it.
+    inline void upload() {
+        if (!buffer) {
+            bind();
+        }
+    }
+
 protected:
     // increase the buffer size by at least /required/ bytes.
     inline void *addElement() {
diff --git a/src/mbgl/geometry/glyph_atlas.cpp b/src/mbgl/geometry/glyph_atlas.cpp
index f690004b5..bb230e4ef 100644
--- a/src/mbgl/geometry/glyph_atlas.cpp
+++ b/src/mbgl/geometry/glyph_atlas.cpp
@@ -4,6 +4,8 @@
 #include <mbgl/platform/log.hpp>
 #include <mbgl/platform/platform.hpp>
 
+#include <mbgl/util/std.hpp>
+
 #include <cassert>
 #include <algorithm>
 
@@ -14,7 +16,7 @@ GlyphAtlas::GlyphAtlas(uint16_t width_, uint16_t height_)
     : width(width_),
       height(height_),
       bin(width_, height_),
-      data(new char[width_ *height_]),
+      data(util::make_unique<uint8_t[]>(width_ * height_)),
       dirty(true) {
 }
 
@@ -88,13 +90,12 @@ Rect<uint16_t> GlyphAtlas::addGlyph(uintptr_t tileUID,
     face.emplace(glyph.id, GlyphValue { rect, tileUID });
 
     // Copy the bitmap
-    char *target = data.get();
-    const char *source = glyph.bitmap.data();
+    const uint8_t* source = reinterpret_cast<const uint8_t*>(glyph.bitmap.data());
     for (uint32_t y = 0; y < buffered_height; y++) {
         uint32_t y1 = width * (rect.y + y) + rect.x;
         uint32_t y2 = buffered_width * y;
         for (uint32_t x = 0; x < buffered_width; x++) {
-            target[y1 + x] = source[y2 + x];
+            data[y1 + x] = source[y2 + x];
         }
     }
 
@@ -116,7 +117,7 @@ void GlyphAtlas::removeGlyphs(uintptr_t tileUID) {
                 const Rect<uint16_t>& rect = value.rect;
 
                 // Clear out the bitmap.
-                char *target = data.get();
+                uint8_t *target = data.get();
                 for (uint32_t y = 0; y < rect.h; y++) {
                     uint32_t y1 = width * (rect.y + y) + rect.x;
                     for (uint32_t x = 0; x < rect.w; x++) {
@@ -124,8 +125,6 @@ void GlyphAtlas::removeGlyphs(uintptr_t tileUID) {
                     }
                 }
 
-                dirty = true;
-
                 bin.release(rect);
 
                 // Make sure to post-increment the iterator: This will return the
@@ -140,6 +139,47 @@ void GlyphAtlas::removeGlyphs(uintptr_t tileUID) {
     }
 }
 
+void GlyphAtlas::upload() {
+    if (dirty) {
+        const bool first = !texture;
+        bind();
+
+        std::lock_guard<std::mutex> lock(mtx);
+
+        if (first) {
+            MBGL_CHECK_ERROR(glTexImage2D(
+                GL_TEXTURE_2D, // GLenum target
+                0, // GLint level
+                GL_ALPHA, // GLint internalformat
+                width, // GLsizei width
+                height, // GLsizei height
+                0, // GLint border
+                GL_ALPHA, // GLenum format
+                GL_UNSIGNED_BYTE, // GLenum type
+                data.get() // const GLvoid* data
+            ));
+        } else {
+            MBGL_CHECK_ERROR(glTexSubImage2D(
+                GL_TEXTURE_2D, // GLenum target
+                0, // GLint level
+                0, // GLint xoffset
+                0, // GLint yoffset
+                width, // GLsizei width
+                height, // GLsizei height
+                GL_ALPHA, // GLenum format
+                GL_UNSIGNED_BYTE, // GLenum type
+                data.get() // const GLvoid* data
+            ));
+        }
+
+        dirty = false;
+
+#if defined(DEBUG)
+        // platform::showDebugImage("Glyph Atlas", data.get(), width, height);
+#endif
+    }
+}
+
 void GlyphAtlas::bind() {
     if (!texture) {
         MBGL_CHECK_ERROR(glGenTextures(1, &texture));
@@ -154,14 +194,4 @@ void GlyphAtlas::bind() {
     } else {
         MBGL_CHECK_ERROR(glBindTexture(GL_TEXTURE_2D, texture));
     }
-
-    if (dirty) {
-        std::lock_guard<std::mutex> lock(mtx);
-        MBGL_CHECK_ERROR(glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, width, height, 0, GL_ALPHA, GL_UNSIGNED_BYTE, data.get()));
-        dirty = false;
-
-#if defined(DEBUG)
-        // platform::showDebugImage("Glyph Atlas", data, width, height);
-#endif
-    }
 };
diff --git a/src/mbgl/geometry/glyph_atlas.hpp b/src/mbgl/geometry/glyph_atlas.hpp
index a25c735a8..8bc21da09 100644
--- a/src/mbgl/geometry/glyph_atlas.hpp
+++ b/src/mbgl/geometry/glyph_atlas.hpp
@@ -24,8 +24,13 @@ public:
                    GlyphPositions&);
     void removeGlyphs(uintptr_t tileUID);
 
+    // Binds the atlas texture to the GPU, and uploads data if it is out of date.
     void bind();
 
+    // Uploads the texture to the GPU to be available when we need it. This is a lazy operation;
+    // the texture is only bound when the data is out of date (=dirty).
+    void upload();
+
     const uint16_t width = 0;
     const uint16_t height = 0;
 
@@ -44,7 +49,7 @@ private:
     std::mutex mtx;
     BinPack<uint16_t> bin;
     std::map<std::string, std::map<uint32_t, GlyphValue>> index;
-    std::unique_ptr<char[]> data;
+    const std::unique_ptr<uint8_t[]> data;
     std::atomic<bool> dirty;
     uint32_t texture = 0;
 };
diff --git a/src/mbgl/geometry/line_atlas.cpp b/src/mbgl/geometry/line_atlas.cpp
index f64989d66..91ac15639 100644
--- a/src/mbgl/geometry/line_atlas.cpp
+++ b/src/mbgl/geometry/line_atlas.cpp
@@ -3,6 +3,7 @@
 #include <mbgl/platform/gl.hpp>
 #include <mbgl/platform/log.hpp>
 #include <mbgl/platform/platform.hpp>
+#include <mbgl/util/std.hpp>
 
 #include <boost/functional/hash.hpp>
 
@@ -14,7 +15,7 @@ using namespace mbgl;
 LineAtlas::LineAtlas(uint16_t w, uint16_t h)
     : width(w),
       height(h),
-      data(new char[w * h]),
+      data(util::make_unique<uint8_t[]>(w * h)),
       dirty(true) {
 }
 
@@ -23,8 +24,6 @@ LineAtlas::~LineAtlas() {
 
     Environment::Get().abandonTexture(texture);
     texture = 0;
-
-    delete[] data;
 }
 
 LinePatternPos LineAtlas::getDashPosition(const std::vector<float> &dasharray, bool round) {
@@ -129,6 +128,12 @@ LinePatternPos LineAtlas::addDash(const std::vector<float> &dasharray, bool roun
     return position;
 };
 
+void LineAtlas::upload() {
+    if (dirty) {
+        bind();
+    }
+}
+
 void LineAtlas::bind() {
     std::lock_guard<std::recursive_mutex> lock(mtx);
 
@@ -147,7 +152,7 @@ void LineAtlas::bind() {
 
     if (dirty) {
         if (first) {
-            glTexImage2D(
+            MBGL_CHECK_ERROR(glTexImage2D(
                 GL_TEXTURE_2D, // GLenum target
                 0, // GLint level
                 GL_ALPHA, // GLint internalformat
@@ -156,10 +161,10 @@ void LineAtlas::bind() {
                 0, // GLint border
                 GL_ALPHA, // GLenum format
                 GL_UNSIGNED_BYTE, // GLenum type
-                data // const GLvoid * data
-            );
+                data.get() // const GLvoid * data
+            ));
         } else {
-            glTexSubImage2D(
+            MBGL_CHECK_ERROR(glTexSubImage2D(
                 GL_TEXTURE_2D, // GLenum target
                 0, // GLint level
                 0, // GLint xoffset
@@ -168,8 +173,8 @@ void LineAtlas::bind() {
                 height, // GLsizei height
                 GL_ALPHA, // GLenum format
                 GL_UNSIGNED_BYTE, // GLenum type
-                data // const GLvoid *pixels
-            );
+                data.get() // const GLvoid *pixels
+            ));
         }
 
 
diff --git a/src/mbgl/geometry/line_atlas.hpp b/src/mbgl/geometry/line_atlas.hpp
index df60a2dec..296c997f7 100644
--- a/src/mbgl/geometry/line_atlas.hpp
+++ b/src/mbgl/geometry/line_atlas.hpp
@@ -19,8 +19,13 @@ public:
     LineAtlas(uint16_t width, uint16_t height);
     ~LineAtlas();
 
+    // Binds the atlas texture to the GPU, and uploads data if it is out of date.
     void bind();
 
+    // Uploads the texture to the GPU to be available when we need it. This is a lazy operation;
+    // the texture is only bound when the data is out of date (=dirty).
+    void upload();
+
     LinePatternPos getDashPosition(const std::vector<float>&, bool);
     LinePatternPos addDash(const std::vector<float> &dasharray, bool round);
 
@@ -29,7 +34,7 @@ public:
 
 private:
     std::recursive_mutex mtx;
-    char *const data = nullptr;
+    const std::unique_ptr<uint8_t[]> data;
     std::atomic<bool> dirty;
     uint32_t texture = 0;
     int nextRow = 0;
diff --git a/src/mbgl/geometry/sprite_atlas.cpp b/src/mbgl/geometry/sprite_atlas.cpp
index c2686e2f3..5d47793cf 100644
--- a/src/mbgl/geometry/sprite_atlas.cpp
+++ b/src/mbgl/geometry/sprite_atlas.cpp
@@ -33,9 +33,7 @@ bool SpriteAtlas::resize(const float newRatio) {
     pixelRatio = newRatio;
 
     if (data) {
-        uint32_t *old_data = data;
-
-        data = nullptr;
+        const auto oldData = std::move(data);
         allocate();
 
         const int old_w = width * oldRatio;
@@ -44,20 +42,17 @@ bool SpriteAtlas::resize(const float newRatio) {
         const int new_h = height * newRatio;
 
         // Basic image scaling. TODO: Replace this with better image scaling.
-        uint32_t *img_new = reinterpret_cast<uint32_t *>(data);
-        const uint32_t *img_old = reinterpret_cast<const uint32_t *>(old_data);
-
         for (int y = 0; y < new_h; y++) {
             const int old_yoffset = ((y * old_h) / new_h) * old_w;
             const int new_yoffset = y * new_w;
             for (int x = 0; x < new_w; x++) {
                 const int old_x = (x * old_w) / new_w;
-                img_new[new_yoffset + x] = img_old[old_yoffset + old_x];
+                data[new_yoffset + x] = oldData[old_yoffset + old_x];
             }
         }
 
-        ::operator delete(old_data);
         dirty = true;
+        fullUploadRequired = true;
 
         // Mark all sprite images as in need of update
         for (const auto &pair : images) {
@@ -143,8 +138,8 @@ void SpriteAtlas::allocate() {
     if (!data) {
         dimension w = static_cast<dimension>(width * pixelRatio);
         dimension h = static_cast<dimension>(height * pixelRatio);
-        data = static_cast<uint32_t*>(::operator new(w * h * sizeof(uint32_t)));
-        std::fill(data, data + w * h, 0);
+        data = util::make_unique<uint32_t[]>(w * h);
+        std::fill(data.get(), data.get() + w * h, 0);
     }
 }
 
@@ -157,7 +152,7 @@ void SpriteAtlas::copy(const Rect<dimension>& dst, const SpritePosition& src, co
     const Rect<uint32_t> srcPos { src.x, src.y, src.width, src.height };
 
     allocate();
-    uint32_t *dstData = reinterpret_cast<uint32_t *>(data);
+    uint32_t *const dstData = data.get();
     const vec2<uint32_t> dstSize { static_cast<unsigned int>(width * pixelRatio),
                                    static_cast<unsigned int>(height * pixelRatio) };
     const Rect<uint32_t> dstPos { static_cast<uint32_t>(dst.x * pixelRatio),
@@ -230,8 +225,13 @@ void SpriteAtlas::setSprite(util::ptr<Sprite> sprite_) {
     });
 }
 
+void SpriteAtlas::upload() {
+    if (dirty) {
+        bind();
+    }
+}
+
 void SpriteAtlas::bind(bool linear) {
-    bool first = false;
     if (!texture) {
         MBGL_CHECK_ERROR(glGenTextures(1, &texture));
         MBGL_CHECK_ERROR(glBindTexture(GL_TEXTURE_2D, texture));
@@ -242,7 +242,7 @@ void SpriteAtlas::bind(bool linear) {
         // We use those when the pixelRatio isn't a power of two, e.g. on iPhone 6 Plus.
         MBGL_CHECK_ERROR(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE));
         MBGL_CHECK_ERROR(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE));
-        first = true;
+        fullUploadRequired = true;
     } else {
         MBGL_CHECK_ERROR(glBindTexture(GL_TEXTURE_2D, texture));
     }
@@ -258,7 +258,7 @@ void SpriteAtlas::bind(bool linear) {
         std::lock_guard<std::recursive_mutex> lock(mtx);
         allocate();
 
-        if (first) {
+        if (fullUploadRequired) {
             MBGL_CHECK_ERROR(glTexImage2D(
                 GL_TEXTURE_2D, // GLenum target
                 0, // GLint level
@@ -268,8 +268,9 @@ void SpriteAtlas::bind(bool linear) {
                 0, // GLint border
                 GL_RGBA, // GLenum format
                 GL_UNSIGNED_BYTE, // GLenum type
-                data // const GLvoid * data
+                data.get() // const GLvoid * data
             ));
+            fullUploadRequired = false;
         } else {
             MBGL_CHECK_ERROR(glTexSubImage2D(
                 GL_TEXTURE_2D, // GLenum target
@@ -280,7 +281,7 @@ void SpriteAtlas::bind(bool linear) {
                 height * pixelRatio, // GLsizei height
                 GL_RGBA, // GLenum format
                 GL_UNSIGNED_BYTE, // GLenum type
-                data // const GLvoid *pixels
+                data.get() // const GLvoid *pixels
             ));
         }
 
@@ -296,5 +297,4 @@ SpriteAtlas::~SpriteAtlas() {
     std::lock_guard<std::recursive_mutex> lock(mtx);
     Environment::Get().abandonTexture(texture);
     texture = 0;
-    ::operator delete(data), data = nullptr;
 }
diff --git a/src/mbgl/geometry/sprite_atlas.hpp b/src/mbgl/geometry/sprite_atlas.hpp
index 079c15cef..d34013cd6 100644
--- a/src/mbgl/geometry/sprite_atlas.hpp
+++ b/src/mbgl/geometry/sprite_atlas.hpp
@@ -50,10 +50,13 @@ public:
 
     SpriteAtlasPosition getPosition(const std::string& name, bool repeating = false);
 
-    // Binds the image buffer of this sprite atlas to the GPU, and uploads data if it is out
-    // of date.
+    // Binds the atlas texture to the GPU, and uploads data if it is out of date.
     void bind(bool linear = false);
 
+    // Uploads the texture to the GPU to be available when we need it. This is a lazy operation;
+    // the texture is only bound when the data is out of date (=dirty).
+    void upload();
+
     inline float getWidth() const { return width; }
     inline float getHeight() const { return height; }
     inline float getTextureWidth() const { return width * pixelRatio; }
@@ -74,8 +77,9 @@ private:
     util::ptr<Sprite> sprite;
     std::map<std::string, Rect<dimension>> images;
     std::set<std::string> uninitialized;
-    uint32_t *data = nullptr;
+    std::unique_ptr<uint32_t[]> data;
     std::atomic<bool> dirty;
+    bool fullUploadRequired = true;
     uint32_t texture = 0;
     uint32_t filter = 0;
     static const int buffer = 1;
diff --git a/src/mbgl/geometry/vao.cpp b/src/mbgl/geometry/vao.cpp
index fef74396a..440e48c57 100644
--- a/src/mbgl/geometry/vao.cpp
+++ b/src/mbgl/geometry/vao.cpp
@@ -5,11 +5,46 @@
 
 namespace mbgl {
 
+static gl::ExtensionFunction<
+    void (GLuint array)>
+    BindVertexArray({
+        {"GL_ARB_vertex_array_object", "glBindVertexArray"},
+        {"GL_OES_vertex_array_object", "glBindVertexArrayOES"},
+        {"GL_APPLE_vertex_array_object", "glBindVertexArrayAPPLE"}
+    });
+
+static gl::ExtensionFunction<
+    void (GLsizei n,
+          const GLuint* arrays)>
+    DeleteVertexArrays({
+        {"GL_ARB_vertex_array_object", "glDeleteVertexArrays"},
+        {"GL_OES_vertex_array_object", "glDeleteVertexArraysOES"},
+        {"GL_APPLE_vertex_array_object", "glDeleteVertexArraysAPPLE"}
+    });
+
+static gl::ExtensionFunction<
+    void (GLsizei n,
+          GLuint* arrays)>
+    GenVertexArrays({
+        {"GL_ARB_vertex_array_object", "glGenVertexArrays"},
+        {"GL_OES_vertex_array_object", "glGenVertexArraysOES"},
+        {"GL_APPLE_vertex_array_object", "glGenVertexArraysAPPLE"}
+    });
+
+void VertexArrayObject::Unbind() {
+    if (!BindVertexArray) return;
+    MBGL_CHECK_ERROR(BindVertexArray(0));
+}
+
+void VertexArrayObject::Delete(GLsizei n, const GLuint* arrays) {
+    MBGL_CHECK_ERROR(DeleteVertexArrays(n, arrays));
+}
+
 VertexArrayObject::VertexArrayObject() {
 }
 
 VertexArrayObject::~VertexArrayObject() {
-    if (!gl::DeleteVertexArrays) return;
+    if (!DeleteVertexArrays) return;
 
     if (vao) {
         Environment::Get().abandonVAO(vao);
@@ -17,7 +52,7 @@ VertexArrayObject::~VertexArrayObject() {
 }
 
 void VertexArrayObject::bindVertexArrayObject() {
-    if (!gl::GenVertexArrays || !gl::BindVertexArray) {
+    if (!GenVertexArrays || !BindVertexArray) {
         static bool reported = false;
         if (!reported) {
             Log::Warning(Event::OpenGL, "Not using Vertex Array Objects");
@@ -27,9 +62,9 @@ void VertexArrayObject::bindVertexArrayObject() {
     }
 
     if (!vao) {
-        MBGL_CHECK_ERROR(gl::GenVertexArrays(1, &vao));
+        MBGL_CHECK_ERROR(GenVertexArrays(1, &vao));
     }
-    MBGL_CHECK_ERROR(gl::BindVertexArray(vao));
+    MBGL_CHECK_ERROR(BindVertexArray(vao));
 }
 
 void VertexArrayObject::verifyBinding(Shader &shader, GLuint vertexBuffer, GLuint elementsBuffer,
diff --git a/src/mbgl/geometry/vao.hpp b/src/mbgl/geometry/vao.hpp
index 72bacfd79..e512a3e48 100644
--- a/src/mbgl/geometry/vao.hpp
+++ b/src/mbgl/geometry/vao.hpp
@@ -11,6 +11,9 @@ namespace mbgl {
 
 class VertexArrayObject : public util::noncopyable {
 public:
+    static void Unbind();
+    static void Delete(GLsizei n, const GLuint* arrays);
+
     VertexArrayObject();
     ~VertexArrayObject();
 
diff --git a/src/mbgl/gl/debugging.cpp b/src/mbgl/gl/debugging.cpp
new file mode 100644
index 000000000..5fc90e827
--- /dev/null
+++ b/src/mbgl/gl/debugging.cpp
@@ -0,0 +1,195 @@
+#include <mbgl/gl/debugging.hpp>
+#include <mbgl/platform/gl.hpp>
+#include <mbgl/platform/event.hpp>
+#include <mbgl/platform/log.hpp>
+
+#define GL_DEBUG_OUTPUT_SYNCHRONOUS       0x8242
+#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243
+#define GL_DEBUG_CALLBACK_FUNCTION        0x8244
+#define GL_DEBUG_CALLBACK_USER_PARAM      0x8245
+#define GL_DEBUG_SOURCE_API               0x8246
+#define GL_DEBUG_SOURCE_WINDOW_SYSTEM     0x8247
+#define GL_DEBUG_SOURCE_SHADER_COMPILER   0x8248
+#define GL_DEBUG_SOURCE_THIRD_PARTY       0x8249
+#define GL_DEBUG_SOURCE_APPLICATION       0x824A
+#define GL_DEBUG_SOURCE_OTHER             0x824B
+#define GL_DEBUG_TYPE_ERROR               0x824C
+#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D
+#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR  0x824E
+#define GL_DEBUG_TYPE_PORTABILITY         0x824F
+#define GL_DEBUG_TYPE_PERFORMANCE         0x8250
+#define GL_DEBUG_TYPE_OTHER               0x8251
+#define GL_MAX_DEBUG_MESSAGE_LENGTH       0x9143
+#define GL_MAX_DEBUG_LOGGED_MESSAGES      0x9144
+#define GL_DEBUG_LOGGED_MESSAGES          0x9145
+#define GL_DEBUG_SEVERITY_HIGH            0x9146
+#define GL_DEBUG_SEVERITY_MEDIUM          0x9147
+#define GL_DEBUG_SEVERITY_LOW             0x9148
+#define GL_DEBUG_TYPE_MARKER              0x8268
+#define GL_DEBUG_TYPE_PUSH_GROUP          0x8269
+#define GL_DEBUG_TYPE_POP_GROUP           0x826A
+#define GL_DEBUG_SEVERITY_NOTIFICATION    0x826B
+#define GL_MAX_DEBUG_GROUP_STACK_DEPTH    0x826C
+#define GL_DEBUG_GROUP_STACK_DEPTH        0x826D
+#define GL_BUFFER                         0x82E0
+#define GL_SHADER                         0x82E1
+#define GL_PROGRAM                        0x82E2
+#define GL_QUERY                          0x82E3
+#define GL_PROGRAM_PIPELINE               0x82E4
+#define GL_SAMPLER                        0x82E6
+#define GL_MAX_LABEL_LENGTH               0x82E8
+#define GL_DEBUG_OUTPUT                   0x92E0
+#define GL_CONTEXT_FLAG_DEBUG_BIT         0x00000002
+#define GL_DISPLAY_LIST                   0x82E7
+#define GL_VERTEX_ARRAY                   0x8074
+#define GL_TRANSFORM_FEEDBACK             0x8E22
+#define GL_TEXTURE                        0x1702
+#define GL_RENDERBUFFER                   0x8D41
+#define GL_FRAMEBUFFER                    0x8D40
+
+namespace mbgl {
+namespace gl {
+namespace debugging {
+
+typedef void (*GLDEBUGPROC)(GLenum source,
+                            GLenum type,
+                            GLuint id,
+                            GLenum severity,
+                            GLsizei length,
+                            const GLchar *message,
+                            const void *userParam);
+
+static ExtensionFunction<
+    void (GLenum source,
+          GLenum type,
+          GLenum severity,
+          GLsizei count,
+          const GLuint *ids,
+          GLboolean enabled)>
+    DebugMessageControl({
+        {"GL_KHR_debug",        "glDebugMessageControl"},
+        {"GL_ARB_debug_output", "glDebugMessageControlARB"}
+    });
+
+static ExtensionFunction<
+    void (GLDEBUGPROC callback,
+          const void *userParam)>
+    DebugMessageCallback({
+        {"GL_KHR_debug",        "glDebugMessageCallback"},
+        {"GL_ARB_debug_output", "glDebugMessageCallbackARB"}
+    });
+
+static ExtensionFunction<
+    void (GLenum source,
+          GLuint id,
+          GLsizei length,
+          const GLchar *message)>
+    PushDebugGroup({
+        {"GL_KHR_debug", "glPushDebugGroup"}
+    });
+
+static ExtensionFunction<
+    void ()>
+    PopDebugGroup({
+        {"GL_KHR_debug", "glPopDebugGroup"}
+    });
+
+static ExtensionFunction<
+    void (GLsizei length,
+          const GLchar *marker)>
+    PushGroupMarkerEXT({
+      {"GL_EXT_debug_marker", "glPushGroupMarkerEXT"}
+    });
+
+static ExtensionFunction<
+    void ()>
+    PopGroupMarkerEXT({
+      {"GL_EXT_debug_marker", "glPopGroupMarkerEXT"}
+    });
+
+void debugCallback(GLenum source,
+                   GLenum type,
+                   GLuint id,
+                   GLenum severity,
+                   GLsizei /*length*/,
+                   const GLchar* message,
+                   const void* /*userParam*/)
+{
+    std::string strSource;
+    switch (source) {
+        case GL_DEBUG_SOURCE_API: strSource = "DEBUG_SOURCE_API"; break;
+        case GL_DEBUG_SOURCE_WINDOW_SYSTEM: strSource = "DEBUG_SOURCE_WINDOW_SYSTEM"; break;
+        case GL_DEBUG_SOURCE_SHADER_COMPILER: strSource = "DEBUG_SOURCE_SHADER_COMPILER"; break;
+        case GL_DEBUG_SOURCE_THIRD_PARTY: strSource = "DEBUG_SOURCE_THIRD_PARTY"; break;
+        case GL_DEBUG_SOURCE_APPLICATION: strSource = "DEBUG_SOURCE_APPLICATION"; break;
+        case GL_DEBUG_SOURCE_OTHER: strSource = "DEBUG_SOURCE_OTHER"; break;
+        default: strSource = "(unknown)"; break;
+    }
+
+    std::string strType;
+    switch (type) {
+        case GL_DEBUG_TYPE_ERROR: strType = "DEBUG_TYPE_ERROR"; break;
+        case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR: strType = "DEBUG_TYPE_DEPRECATED_BEHAVIOR"; break;
+        case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR: strType = "DEBUG_TYPE_UNDEFINED_BEHAVIOR"; break;
+        case GL_DEBUG_TYPE_PERFORMANCE: strType = "DEBUG_TYPE_PERFORMANCE"; break;
+        case GL_DEBUG_TYPE_PORTABILITY: strType = "DEBUG_TYPE_PORTABILITY"; break;
+        case GL_DEBUG_TYPE_OTHER: strType = "DEBUG_TYPE_OTHER"; break;
+        case GL_DEBUG_TYPE_MARKER: strType = "DEBUG_TYPE_MARKER"; break;
+        case GL_DEBUG_TYPE_PUSH_GROUP: strType = "DEBUG_TYPE_OTHER"; break;
+        case GL_DEBUG_TYPE_POP_GROUP: strType = "DEBUG_TYPE_POP_GROUP"; break;
+        default: strSource = "(unknown)"; break;
+    }
+
+    std::string strSeverity;
+    mbgl::EventSeverity evtSeverity;
+    switch (severity) {
+        case GL_DEBUG_SEVERITY_HIGH: strSeverity = "DEBUG_SEVERITY_HIGH"; evtSeverity = mbgl::EventSeverity::Error; break;
+        case GL_DEBUG_SEVERITY_MEDIUM: strSeverity = "DEBUG_SEVERITY_MEDIUM"; evtSeverity = mbgl::EventSeverity::Warning; break;
+        case GL_DEBUG_SEVERITY_LOW: strSeverity = "DEBUG_SEVERITY_LOW"; evtSeverity = mbgl::EventSeverity::Info; break;
+        case GL_DEBUG_SEVERITY_NOTIFICATION: strSeverity = "DEBUG_SEVERITY_NOTIFICATION"; evtSeverity = mbgl::EventSeverity::Debug; break;
+        default: strSource = "(unknown)"; evtSeverity = mbgl::EventSeverity::Debug; break;
+    }
+
+    mbgl::Log::Record(evtSeverity, mbgl::Event::OpenGL, "GL_%s GL_%s %u GL_%s - %s", strSource.c_str(), strType.c_str(), id, strSeverity.c_str(), message);
+}
+
+void enable() {
+    if (!DebugMessageControl || !DebugMessageCallback) {
+        return;
+    }
+
+    // This will enable all messages including performance hints
+    //MBGL_CHECK_ERROR(DebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, nullptr, GL_TRUE));
+
+    // This will only enable high and medium severity messages
+    MBGL_CHECK_ERROR(DebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DEBUG_SEVERITY_HIGH, 0, nullptr, GL_TRUE));
+    MBGL_CHECK_ERROR(DebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DEBUG_SEVERITY_MEDIUM, 0, nullptr, GL_TRUE));
+    MBGL_CHECK_ERROR(DebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DEBUG_SEVERITY_NOTIFICATION, 0, nullptr, GL_FALSE));
+
+    MBGL_CHECK_ERROR(DebugMessageCallback(debugCallback, nullptr));
+}
+
+#if defined(DEBUG)
+group::group(const std::string& str) {
+    if (PushDebugGroup) {
+        PushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, GLsizei(str.size()), str.c_str());
+    } else if (PushGroupMarkerEXT) {
+        PushGroupMarkerEXT(GLsizei(str.size()), str.c_str());
+    }
+}
+
+group::~group() {
+    if (PopDebugGroup) {
+        PopDebugGroup();
+    } else if (PopGroupMarkerEXT) {
+        PopGroupMarkerEXT();
+    }
+}
+#else
+group::group(const std::string&) {}
+group::~group() = default;
+#endif
+
+}
+}
+}
diff --git a/src/mbgl/gl/debugging.hpp b/src/mbgl/gl/debugging.hpp
new file mode 100644
index 000000000..82d08a53f
--- /dev/null
+++ b/src/mbgl/gl/debugging.hpp
@@ -0,0 +1,21 @@
+#ifndef MBGL_GL_DEBUG_MESSAGES
+#define MBGL_GL_DEBUG_MESSAGES
+
+#include <string>
+
+namespace mbgl {
+namespace gl {
+namespace debugging {
+
+void enable();
+
+struct group {
+    group(const std::string&);
+    ~group();
+};
+
+}
+}
+}
+
+#endif
diff --git a/src/mbgl/map/annotation.cpp b/src/mbgl/map/annotation.cpp
index b921c08f7..7a7a0ed68 100644
--- a/src/mbgl/map/annotation.cpp
+++ b/src/mbgl/map/annotation.cpp
@@ -2,6 +2,8 @@
 #include <mbgl/map/map.hpp>
 #include <mbgl/map/tile_id.hpp>
 #include <mbgl/map/live_tile.hpp>
+#include <mbgl/map/map_data.hpp>
+#include <mbgl/util/constants.hpp>
 #include <mbgl/util/ptr.hpp>
 #include <mbgl/util/std.hpp>
 
@@ -83,8 +85,10 @@ vec2<double> AnnotationManager::projectPoint(const LatLng& point) {
     return { x, y };
 }
 
-std::pair<std::vector<TileID>, AnnotationIDs> AnnotationManager::addPointAnnotations(
-    const std::vector<LatLng>& points, const std::vector<std::string>& symbols, const Map& map) {
+std::pair<std::vector<TileID>, AnnotationIDs>
+AnnotationManager::addPointAnnotations(const std::vector<LatLng>& points,
+                                       const std::vector<std::string>& symbols,
+                                       const MapData& data) {
     std::lock_guard<std::mutex> lock(mtx);
 
     // We pre-generate tiles to contain each annotation up to the map's max zoom.
@@ -109,7 +113,7 @@ std::pair<std::vector<TileID>, AnnotationIDs> AnnotationManager::addPointAnnotat
             util::make_unique<Annotation>(AnnotationType::Point,
                                           AnnotationSegments({ { points[i] } })));
 
-        const uint8_t maxZoom = map.getMaxZoom();
+        const uint8_t maxZoom = data.transform.getMaxZoom();
 
         // side length of map at this zoom
         uint32_t z2 = 1 << maxZoom;
@@ -181,13 +185,14 @@ std::pair<std::vector<TileID>, AnnotationIDs> AnnotationManager::addPointAnnotat
     return std::make_pair(affectedTiles, annotationIDs);
 }
 
-std::vector<TileID> AnnotationManager::removeAnnotations(const AnnotationIDs& ids, const Map& map) {
+std::vector<TileID> AnnotationManager::removeAnnotations(const AnnotationIDs& ids,
+                                                         const MapData& data) {
     std::lock_guard<std::mutex> lock(mtx);
 
     std::vector<TileID> affectedTiles;
 
     std::vector<uint32_t> z2s;
-    uint8_t zoomCount = map.getMaxZoom() + 1;
+    const uint8_t zoomCount = data.transform.getMaxZoom() + 1;
     z2s.reserve(zoomCount);
     for (uint8_t z = 0; z < zoomCount; ++z) {
         z2s.emplace_back(1<< z);
@@ -231,10 +236,10 @@ std::vector<TileID> AnnotationManager::removeAnnotations(const AnnotationIDs& id
 }
 
 std::vector<uint32_t> AnnotationManager::getAnnotationsInBounds(const LatLngBounds& queryBounds,
-                                                                const Map& map) const {
+                                                                const MapData& data) const {
     std::lock_guard<std::mutex> lock(mtx);
 
-    const uint8_t z = map.getMaxZoom();
+    const uint8_t z = data.transform.getMaxZoom();
     const uint32_t z2 = 1 << z;
     const vec2<double> swPoint = projectPoint(queryBounds.sw);
     const vec2<double> nePoint = projectPoint(queryBounds.ne);
diff --git a/src/mbgl/map/annotation.hpp b/src/mbgl/map/annotation.hpp
index f1596dbdf..a80b03226 100644
--- a/src/mbgl/map/annotation.hpp
+++ b/src/mbgl/map/annotation.hpp
@@ -19,6 +19,7 @@ namespace mbgl {
 class Annotation;
 class Map;
 class LiveTile;
+class MapData;
 
 using AnnotationIDs = std::vector<uint32_t>;
 
@@ -29,9 +30,9 @@ public:
 
     void setDefaultPointAnnotationSymbol(const std::string& symbol);
     std::pair<std::vector<TileID>, AnnotationIDs> addPointAnnotations(
-        const std::vector<LatLng>&, const std::vector<std::string>& symbols, const Map&);
-    std::vector<TileID> removeAnnotations(const AnnotationIDs&, const Map&);
-    AnnotationIDs getAnnotationsInBounds(const LatLngBounds&, const Map&) const;
+        const std::vector<LatLng>&, const std::vector<std::string>& symbols, const MapData&);
+    std::vector<TileID> removeAnnotations(const AnnotationIDs&, const MapData&);
+    AnnotationIDs getAnnotationsInBounds(const LatLngBounds&, const MapData&) const;
     LatLngBounds getBoundsForAnnotations(const AnnotationIDs&) const;
 
     const LiveTile* getTile(const TileID& id);
diff --git a/src/mbgl/map/environment.cpp b/src/mbgl/map/environment.cpp
index 469790501..f2112c61b 100644
--- a/src/mbgl/map/environment.cpp
+++ b/src/mbgl/map/environment.cpp
@@ -1,6 +1,8 @@
 #include <mbgl/map/environment.hpp>
 #include <mbgl/storage/file_source.hpp>
 #include <mbgl/platform/gl.hpp>
+#include <mbgl/util/run_loop.hpp>
+#include <mbgl/geometry/vao.hpp>
 
 #include <uv.h>
 
@@ -34,10 +36,7 @@ public:
     void registerThread(Environment* env, ThreadType type, const std::string& name) {
         std::lock_guard<std::mutex> lock(mtx);
 
-        // FIXME: We should never need to overwrite a thread here and we only allow
-        // this today because on the Static mode, the Map thread and the Main thread
-        // are same. Replace this with emplace() when this gets fixed.
-        threadSet[std::this_thread::get_id()] = ThreadInfo{ env, type, name };
+        threadSet.emplace(std::this_thread::get_id(), ThreadInfo{ env, type, name });
     }
 
     void unregisterThread() {
@@ -88,7 +87,7 @@ EnvironmentScope::~EnvironmentScope() {
 }
 
 Environment::Environment(FileSource& fs)
-    : id(makeEnvironmentID()), fileSource(fs), loop(uv_loop_new()) {
+    : id(makeEnvironmentID()), fileSource(fs) {
 }
 
 Environment::~Environment() {
@@ -120,15 +119,9 @@ unsigned Environment::getID() const {
     return id;
 }
 
-void Environment::requestAsync(const Resource& resource,
-                               std::function<void(const Response&)> callback) {
-    fileSource.request(resource, *this, std::move(callback));
-}
-
 Request* Environment::request(const Resource& resource,
                               std::function<void(const Response&)> callback) {
-    assert(currentlyOn(ThreadType::Map));
-    return fileSource.request(resource, loop, *this, std::move(callback));
+    return fileSource.request(resource, util::RunLoop::current.get()->get(), std::move(callback));
 }
 
 void Environment::cancelRequest(Request* req) {
@@ -160,8 +153,8 @@ void Environment::performCleanup() {
     assert(currentlyOn(ThreadType::Map));
 
     if (!abandonedVAOs.empty()) {
-        MBGL_CHECK_ERROR(gl::DeleteVertexArrays(static_cast<GLsizei>(abandonedVAOs.size()),
-                                                abandonedVAOs.data()));
+        MBGL_CHECK_ERROR(VertexArrayObject::Delete(static_cast<GLsizei>(abandonedVAOs.size()),
+                                                   abandonedVAOs.data()));
         abandonedVAOs.clear();
     }
 
@@ -178,10 +171,4 @@ void Environment::performCleanup() {
     }
 }
 
-// #############################################################################################
-
-void Environment::terminate() {
-    fileSource.abort(*this);
-}
-
 }
diff --git a/src/mbgl/map/live_tile_data.cpp b/src/mbgl/map/live_tile_data.cpp
index 8b4f46deb..59f7b4de3 100644
--- a/src/mbgl/map/live_tile_data.cpp
+++ b/src/mbgl/map/live_tile_data.cpp
@@ -11,7 +11,7 @@ using namespace mbgl;
 LiveTileData::LiveTileData(const TileID& id_,
                            AnnotationManager& annotationManager_,
                            float mapMaxZoom,
-                           util::ptr<Style> style_,
+                           Style& style_,
                            GlyphAtlas& glyphAtlas_,
                            GlyphStore& glyphStore_,
                            SpriteAtlas& spriteAtlas_,
@@ -21,13 +21,17 @@ LiveTileData::LiveTileData(const TileID& id_,
                                      spriteAtlas_, sprite_, source_),
       annotationManager(annotationManager_) {
     // live features are always ready
-    state = State::loaded;
+    setState(State::loaded);
 }
 
-LiveTileData::~LiveTileData() {}
+LiveTileData::~LiveTileData() {
+    // Cancel in most derived class destructor so that worker tasks are joined before
+    // any member data goes away.
+    cancel();
+}
 
 void LiveTileData::parse() {
-    if (state != State::loaded) {
+    if (getState() != State::loaded) {
         return;
     }
 
@@ -35,32 +39,19 @@ void LiveTileData::parse() {
 
     if (tile) {
         try {
-            if (!style) {
-                throw std::runtime_error("style isn't present in LiveTileData object anymore");
-            }
-
             // Parsing creates state that is encapsulated in TileParser. While parsing,
             // the TileParser object writes results into this objects. All other state
             // is going to be discarded afterwards.
             TileParser parser(*tile, *this, style, glyphAtlas, glyphStore, spriteAtlas, sprite);
-
-            // Clear the style so that we don't have a cycle in the shared_ptr references.
-            style.reset();
-
             parser.parse();
         } catch (const std::exception& ex) {
             Log::Error(Event::ParseTile, "Live-parsing [%d/%d/%d] failed: %s", id.z, id.x, id.y, ex.what());
-            state = State::obsolete;
+            setState(State::obsolete);
             return;
         }
-    } else {
-        // Clear the style so that we don't have a cycle in the shared_ptr references.
-        style.reset();
-
-        state = State::obsolete;
     }
 
-    if (state != State::obsolete) {
-        state = State::parsed;
+    if (getState() != State::obsolete) {
+        setState(State::parsed);
     }
 }
diff --git a/src/mbgl/map/live_tile_data.hpp b/src/mbgl/map/live_tile_data.hpp
index d40cfdfd6..e56a7bf7e 100644
--- a/src/mbgl/map/live_tile_data.hpp
+++ b/src/mbgl/map/live_tile_data.hpp
@@ -12,7 +12,7 @@ public:
     LiveTileData(const TileID&,
                  AnnotationManager&,
                  float mapMaxZoom,
-                 util::ptr<Style>,
+                 Style&,
                  GlyphAtlas&,
                  GlyphStore&,
                  SpriteAtlas&,
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index e931d09e0..8514c6ecb 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -1,541 +1,147 @@
 #include <mbgl/map/map.hpp>
-#include <mbgl/map/environment.hpp>
+#include <mbgl/map/map_context.hpp>
 #include <mbgl/map/view.hpp>
 #include <mbgl/map/map_data.hpp>
-#include <mbgl/map/still_image.hpp>
-#include <mbgl/platform/platform.hpp>
-#include <mbgl/map/source.hpp>
-#include <mbgl/renderer/painter.hpp>
-#include <mbgl/map/annotation.hpp>
-#include <mbgl/map/sprite.hpp>
-#include <mbgl/util/math.hpp>
-#include <mbgl/util/clip_id.hpp>
-#include <mbgl/util/string.hpp>
-#include <mbgl/util/constants.hpp>
-#include <mbgl/util/uv_detail.hpp>
+
 #include <mbgl/util/std.hpp>
-#include <mbgl/style/style.hpp>
-#include <mbgl/text/glyph_store.hpp>
-#include <mbgl/geometry/glyph_atlas.hpp>
-#include <mbgl/style/style_layer.hpp>
-#include <mbgl/style/style_bucket.hpp>
-#include <mbgl/util/texture_pool.hpp>
-#include <mbgl/geometry/sprite_atlas.hpp>
-#include <mbgl/geometry/line_atlas.hpp>
-#include <mbgl/storage/file_source.hpp>
-#include <mbgl/platform/log.hpp>
-#include <mbgl/util/string.hpp>
-#include <mbgl/util/uv.hpp>
-#include <mbgl/util/mapbox.hpp>
-#include <mbgl/util/exception.hpp>
-#include <mbgl/util/worker.hpp>
+#include <mbgl/util/projection.hpp>
+#include <mbgl/util/thread.hpp>
 
-#include <algorithm>
-#include <iostream>
+namespace mbgl {
 
-#define _USE_MATH_DEFINES
-#include <cmath>
-
-#include <uv.h>
-
-// Check libuv library version.
-const static bool uvVersionCheck = []() {
-    const unsigned int version = uv_version();
-    const unsigned int major = (version >> 16) & 0xFF;
-    const unsigned int minor = (version >> 8) & 0xFF;
-    const unsigned int patch = version & 0xFF;
-
-#ifndef UV_VERSION_PATCH
-    // 0.10 doesn't have UV_VERSION_PATCH defined, so we "fake" it by using the library patch level.
-    const unsigned int UV_VERSION_PATCH = version & 0xFF;
-#endif
-
-    if (major != UV_VERSION_MAJOR || minor != UV_VERSION_MINOR || patch != UV_VERSION_PATCH) {
-        throw std::runtime_error(mbgl::util::sprintf<96>(
-            "libuv version mismatch: headers report %d.%d.%d, but library reports %d.%d.%d", UV_VERSION_MAJOR,
-            UV_VERSION_MINOR, UV_VERSION_PATCH, major, minor, patch));
-    }
-    return true;
-}();
-
-using namespace mbgl;
-
-Map::Map(View& view_, FileSource& fileSource_)
-    : env(util::make_unique<Environment>(fileSource_)),
-      scope(util::make_unique<EnvironmentScope>(*env, ThreadType::Main, "Main")),
-      view(view_),
-      transform(view_),
-      fileSource(fileSource_),
-      glyphAtlas(util::make_unique<GlyphAtlas>(1024, 1024)),
-      glyphStore(std::make_shared<GlyphStore>(*env)),
-      spriteAtlas(util::make_unique<SpriteAtlas>(512, 512)),
-      lineAtlas(util::make_unique<LineAtlas>(512, 512)),
-      texturePool(std::make_shared<TexturePool>()),
-      painter(util::make_unique<Painter>(*spriteAtlas, *glyphAtlas, *lineAtlas)),
-      annotationManager(util::make_unique<AnnotationManager>()),
-      data(util::make_unique<MapData>()),
-      updated(static_cast<UpdateType>(Update::Nothing))
+Map::Map(View& view, FileSource& fileSource, MapMode mode)
+    : data(util::make_unique<MapData>(view, mode)),
+      context(util::make_unique<util::Thread<MapContext>>("Map", util::ThreadPriority::Regular, view, fileSource, *data))
 {
     view.initialize(this);
 }
 
 Map::~Map() {
-    if (mode != Mode::None) {
-        stop();
-    }
-
-    // Extend the scope to include both Main and Map thread types to ease cleanup.
-    scope.reset();
-    scope = util::make_unique<EnvironmentScope>(
-        *env, static_cast<ThreadType>(static_cast<uint8_t>(ThreadType::Main) |
-                                      static_cast<uint8_t>(ThreadType::Map)),
-        "MapandMain");
-
-    // Explicitly reset all pointers.
-    sprite.reset();
-    glyphStore.reset();
-    style.reset();
-    workers.reset();
-    painter.reset();
-    annotationManager.reset();
-    lineAtlas.reset();
-    spriteAtlas.reset();
-    glyphAtlas.reset();
-
-    uv_run(env->loop, UV_RUN_DEFAULT);
-
-    env->performCleanup();
-}
-
-Worker& Map::getWorker() {
-    assert(workers);
-    return *workers;
-}
-
-void Map::start(bool startPaused, Mode renderMode) {
-    assert(Environment::currentlyOn(ThreadType::Main));
-    assert(mode == Mode::None);
-
-    // When starting map rendering in another thread, we perform async/continuously
-    // updated rendering. Only in these cases, we attach the async handlers.
-    mode = renderMode;
-
-    // Reset the flag.
-    isStopped = false;
-
-    // Setup async notifications
-    asyncTerminate = util::make_unique<uv::async>(env->loop, [this]() {
-        assert(Environment::currentlyOn(ThreadType::Map));
-
-        // Remove all of these to make sure they are destructed in the correct thread.
-        style.reset();
-
-        // It's now safe to destroy/join the workers since there won't be any more callbacks that
-        // could dispatch to the worker pool.
-        workers.reset();
-
-        terminating = true;
-
-        // Closes all open handles on the loop. This means that the loop will automatically terminate.
-        asyncRender.reset();
-        asyncUpdate.reset();
-        asyncInvoke.reset();
-        asyncTerminate.reset();
-    });
-
-    asyncUpdate = util::make_unique<uv::async>(env->loop, [this] {
-        // Whenever we call triggerUpdate(), we ref() the asyncUpdate handle to make sure that all
-        // of the calls actually get triggered.
-        asyncUpdate->unref();
-
-        update();
-    });
-
-    asyncInvoke = util::make_unique<uv::async>(env->loop, [this] {
-        processTasks();
-    });
-
-    asyncRender = util::make_unique<uv::async>(env->loop, [this] {
-        // Must be called in Map thread.
-        assert(Environment::currentlyOn(ThreadType::Map));
-
-        render();
-
-        // Finally, notify all listeners that we have finished rendering this frame.
-        {
-            std::lock_guard<std::mutex> lk(mutexRendered);
-            rendered = true;
-        }
-        condRendered.notify_all();
-    });
-
-    // Do we need to pause first?
-    if (startPaused) {
-        pause();
-    }
-
-    thread = std::thread([this]() {
-#ifdef __APPLE__
-        pthread_setname_np("Map");
-#endif
-
-        run();
-
-        // Make sure that the stop() function knows when to stop invoking the callback function.
-        isStopped = true;
-        view.notify();
-    });
-
-    triggerUpdate();
-}
-
-void Map::stop(std::function<void ()> cb) {
-    assert(Environment::currentlyOn(ThreadType::Main));
-    assert(mode != Mode::None);
-
-    asyncTerminate->send();
-
     resume();
-
-    if (cb) {
-        // Wait until the render thread stopped. We are using this construct instead of plainly
-        // relying on the thread_join because the system might need to run things in the current
-        // thread that is required for the render thread to terminate correctly. This is for example
-        // the case with Cocoa's NSURLRequest. Otherwise, we will eventually deadlock because this
-        // thread (== main thread) is blocked. The callback function should use an efficient waiting
-        // function to avoid a busy waiting loop.
-        while (!isStopped) {
-            cb();
-        }
-    }
-
-    // If a callback function was provided, this should return immediately because the thread has
-    // already finished executing.
-    thread.join();
-
-    mode = Mode::None;
 }
 
-void Map::pause(bool waitForPause) {
-    assert(Environment::currentlyOn(ThreadType::Main));
-    assert(mode == Mode::Continuous);
-    mutexRun.lock();
-    pausing = true;
-    mutexRun.unlock();
+void Map::pause() {
+    assert(data->mode == MapMode::Continuous);
 
-    uv_stop(env->loop);
-    triggerUpdate(); // Needed to ensure uv_stop is seen and uv_run exits, otherwise we deadlock on wait_for_pause
-
-    if (waitForPause) {
-        std::unique_lock<std::mutex> lockPause (mutexPause);
-        while (!isPaused) {
-            condPause.wait(lockPause);
-        }
+    if (!paused) {
+        std::unique_lock<std::mutex> lockPause(data->mutexPause);
+        context->invoke(&MapContext::pause);
+        data->condPaused.wait(lockPause);
+        paused = true;
     }
 }
 
 void Map::resume() {
-    assert(Environment::currentlyOn(ThreadType::Main));
-    assert(mode != Mode::None);
-
-    mutexRun.lock();
-    pausing = false;
-    condRun.notify_all();
-    mutexRun.unlock();
+    data->condResume.notify_all();
+    paused = false;
 }
 
-void Map::renderStill(StillImageCallback fn) {
-    assert(Environment::currentlyOn(ThreadType::Main));
-
-    if (mode != Mode::Still) {
-        throw util::Exception("Map is not in still image render mode");
-    }
-
-    if (callback) {
-        throw util::Exception("Map is currently rendering an image");
-    }
-
-    assert(mode == Mode::Still);
-
-    callback = std::move(fn);
-
-    triggerUpdate(Update::RenderStill);
-}
-
-void Map::run() {
-    EnvironmentScope mapScope(*env, ThreadType::Map, "Map");
-    assert(Environment::currentlyOn(ThreadType::Map));
-    assert(mode != Mode::None);
-
-    if (mode == Mode::Continuous) {
-        checkForPause();
-    }
-
-    auto styleInfo = data->getStyleInfo();
-
-    view.activate();
-    view.discard();
-
-    workers = util::make_unique<Worker>(env->loop, 4);
-
-    setup();
-    prepare();
-
-    if (mode == Mode::Continuous) {
-        terminating = false;
-        while (!terminating) {
-            uv_run(env->loop, UV_RUN_DEFAULT);
-            checkForPause();
-        }
-    } else if (mode == Mode::Still) {
-        terminating = false;
-        while (!terminating) {
-            uv_run(env->loop, UV_RUN_DEFAULT);
-
-            // After the loop terminated, these async handles may have been deleted if the terminate()
-            // callback was fired. In this case, we are exiting the loop.
-            if (asyncTerminate && asyncUpdate) {
-                 // Otherwise, loop termination means that we have acquired and parsed all resources
-                // required for this map image and we can now proceed to rendering.
-                render();
-                auto image = view.readStillImage();
-
-                // We are moving the callback out of the way and empty it in case the callback function
-                // starts the next map image render.
-                assert(callback);
-                StillImageCallback cb;
-                std::swap(cb, callback);
-
-                // Now we can finally invoke the callback function with the map image we rendered.
-                cb(std::move(image));
-
-                // To prepare for the next event loop run, we have to make sure the async handles keep
-                // the loop alive.
-                asyncTerminate->ref();
-                asyncUpdate->ref();
-                asyncInvoke->ref();
-                asyncRender->ref();
-            }
-        }
-    } else {
-        abort();
-    }
-
-    // Run the event loop once more to make sure our async delete handlers are called.
-    uv_run(env->loop, UV_RUN_ONCE);
-
-    view.deactivate();
+void Map::renderStill(StillImageCallback callback) {
+    context->invoke(&MapContext::renderStill, callback);
 }
 
 void Map::renderSync() {
-    // Must be called in UI thread.
-    assert(Environment::currentlyOn(ThreadType::Main));
-
-    triggerRender();
-
-    std::unique_lock<std::mutex> lock(mutexRendered);
-    condRendered.wait(lock, [this] { return rendered; });
-    rendered = false;
+    context->invokeSync(&MapContext::render);
 }
 
-void Map::triggerUpdate(const Update u) {
-    updated |= static_cast<UpdateType>(u);
-
-    if (asyncUpdate) {
-        asyncUpdate->ref();
-        asyncUpdate->send();
-    }
+void Map::renderAsync() {
+    context->invoke(&MapContext::render);
 }
 
-void Map::triggerRender() {
-    assert(mode == Mode::Continuous);
-    assert(asyncRender);
-    asyncRender->send();
+void Map::update(Update update_) {
+    context->invoke(&MapContext::triggerUpdate, update_);
 }
 
-// Runs the function in the map thread.
-void Map::invokeTask(std::function<void()>&& fn) {
-    {
-        std::lock_guard<std::mutex> lock(mutexTask);
-        tasks.emplace(::std::forward<std::function<void()>>(fn));
-    }
-
-    if (asyncInvoke) {
-        asyncInvoke->send();
-    }
-}
-
-template <typename Fn> auto Map::invokeSyncTask(const Fn& fn) -> decltype(fn()) {
-    std::promise<decltype(fn())> promise;
-    invokeTask([&fn, &promise] { promise.set_value(fn()); });
-    return promise.get_future().get();
-}
-
-// Processes the functions that should be run in the map thread.
-void Map::processTasks() {
-    std::queue<std::function<void()>> queue;
-    {
-        std::lock_guard<std::mutex> lock(mutexTask);
-        queue.swap(tasks);
-    }
-
-    while (!queue.empty()) {
-        queue.front()();
-        queue.pop();
-    }
-}
-
-void Map::checkForPause() {
-    std::unique_lock<std::mutex> lockRun (mutexRun);
-    while (pausing) {
-        view.deactivate();
-
-        mutexPause.lock();
-        isPaused = true;
-        condPause.notify_all();
-        mutexPause.unlock();
-
-        condRun.wait(lockRun);
-
-        view.activate();
-    }
-
-    mutexPause.lock();
-    isPaused = false;
-    mutexPause.unlock();
-}
-
-void Map::terminate() {
-    assert(painter);
-    painter->terminate();
-    view.deactivate();
-}
-
-#pragma mark - Setup
-
-void Map::setup() {
-    assert(Environment::currentlyOn(ThreadType::Map));
-    assert(painter);
-    painter->setup();
-}
-
-std::string Map::getStyleURL() const {
-    return data->getStyleInfo().url;
-}
+#pragma mark - Style
 
 void Map::setStyleURL(const std::string &url) {
-    assert(Environment::currentlyOn(ThreadType::Main));
-
-    const std::string styleURL = mbgl::util::mapbox::normalizeStyleURL(url, getAccessToken());
-
-    const size_t pos = styleURL.rfind('/');
-    std::string base = "";
-    if (pos != std::string::npos) {
-        base = styleURL.substr(0, pos + 1);
-    }
-
-    data->setStyleInfo({ styleURL, base, "" });
-    triggerUpdate(Update::StyleInfo);
+    context->invoke(&MapContext::setStyleURL, url);
 }
 
 void Map::setStyleJSON(const std::string& json, const std::string& base) {
-    assert(Environment::currentlyOn(ThreadType::Main));
+    context->invoke(&MapContext::setStyleJSON, json, base);
+}
 
-    data->setStyleInfo({ "", base, json });
-    triggerUpdate(Update::StyleInfo);
+std::string Map::getStyleURL() const {
+    return context->invokeSync<std::string>(&MapContext::getStyleURL);
 }
 
 std::string Map::getStyleJSON() const {
-    return data->getStyleInfo().json;
+    return context->invokeSync<std::string>(&MapContext::getStyleJSON);
 }
 
-util::ptr<Sprite> Map::getSprite() {
-    const float pixelRatio = state.getPixelRatio();
-    const std::string &sprite_url = style->getSpriteURL();
-    if (!sprite || !sprite->hasPixelRatio(pixelRatio)) {
-        sprite = Sprite::Create(sprite_url, pixelRatio, *env);
-    }
-
-    return sprite;
-}
-
-
 #pragma mark - Size
 
 void Map::resize(uint16_t width, uint16_t height, float ratio) {
-    resize(width, height, ratio, width * ratio, height * ratio);
-}
-
-void Map::resize(uint16_t width, uint16_t height, float ratio, uint16_t fbWidth, uint16_t fbHeight) {
-    if (transform.resize(width, height, ratio, fbWidth, fbHeight)) {
-        triggerUpdate();
+    if (data->transform.resize(width, height, ratio, width * ratio, height * ratio)) {
+        context->invoke(&MapContext::resize, width, height, ratio);
     }
 }
 
 #pragma mark - Transitions
 
 void Map::cancelTransitions() {
-    transform.cancelTransitions();
-    triggerUpdate();
+    data->transform.cancelTransitions();
+    update();
 }
 
 void Map::setGestureInProgress(bool inProgress) {
-    transform.setGestureInProgress(inProgress);
-    triggerUpdate();
+    data->transform.setGestureInProgress(inProgress);
+    update();
 }
 
 #pragma mark - Position
 
 void Map::moveBy(double dx, double dy, Duration duration) {
-    transform.moveBy(dx, dy, duration);
-    triggerUpdate();
+    data->transform.moveBy(dx, dy, duration);
+    update();
 }
 
 void Map::setLatLng(LatLng latLng, Duration duration) {
-    transform.setLatLng(latLng, duration);
-    triggerUpdate();
+    data->transform.setLatLng(latLng, duration);
+    update();
 }
 
 LatLng Map::getLatLng() const {
-    return transform.getLatLng();
+    return data->transform.getLatLng();
 }
 
 void Map::resetPosition() {
-    transform.setAngle(0);
-    transform.setLatLng(LatLng(0, 0));
-    transform.setZoom(0);
-    triggerUpdate(Update::Zoom);
+    data->transform.setAngle(0);
+    data->transform.setLatLng(LatLng(0, 0));
+    data->transform.setZoom(0);
+    update(Update::Zoom);
 }
 
 
 #pragma mark - Scale
 
 void Map::scaleBy(double ds, double cx, double cy, Duration duration) {
-    transform.scaleBy(ds, cx, cy, duration);
-    triggerUpdate(Update::Zoom);
+    data->transform.scaleBy(ds, cx, cy, duration);
+    update(Update::Zoom);
 }
 
 void Map::setScale(double scale, double cx, double cy, Duration duration) {
-    transform.setScale(scale, cx, cy, duration);
-    triggerUpdate(Update::Zoom);
+    data->transform.setScale(scale, cx, cy, duration);
+    update(Update::Zoom);
 }
 
 double Map::getScale() const {
-    return transform.getScale();
+    return data->transform.getScale();
 }
 
 void Map::setZoom(double zoom, Duration duration) {
-    transform.setZoom(zoom, duration);
-    triggerUpdate(Update::Zoom);
+    data->transform.setZoom(zoom, duration);
+    update(Update::Zoom);
 }
 
 double Map::getZoom() const {
-    return transform.getZoom();
+    return data->transform.getZoom();
 }
 
 void Map::setLatLngZoom(LatLng latLng, double zoom, Duration duration) {
-    transform.setLatLngZoom(latLng, zoom, duration);
-    triggerUpdate(Update::Zoom);
+    data->transform.setLatLngZoom(latLng, zoom, duration);
+    update(Update::Zoom);
 }
 
 void Map::resetZoom() {
@@ -543,40 +149,52 @@ void Map::resetZoom() {
 }
 
 double Map::getMinZoom() const {
-    return transform.getMinZoom();
+    return data->transform.getMinZoom();
 }
 
 double Map::getMaxZoom() const {
-    return transform.getMaxZoom();
+    return data->transform.getMaxZoom();
+}
+
+
+#pragma mark - Size
+
+uint16_t Map::getWidth() const {
+    return data->transform.currentState().getWidth();
+}
+
+uint16_t Map::getHeight() const {
+    return data->transform.currentState().getHeight();
 }
 
 
 #pragma mark - Rotation
 
 void Map::rotateBy(double sx, double sy, double ex, double ey, Duration duration) {
-    transform.rotateBy(sx, sy, ex, ey, duration);
-    triggerUpdate();
+    data->transform.rotateBy(sx, sy, ex, ey, duration);
+    update();
 }
 
 void Map::setBearing(double degrees, Duration duration) {
-    transform.setAngle(-degrees * M_PI / 180, duration);
-    triggerUpdate();
+    data->transform.setAngle(-degrees * M_PI / 180, duration);
+    update();
 }
 
 void Map::setBearing(double degrees, double cx, double cy) {
-    transform.setAngle(-degrees * M_PI / 180, cx, cy);
-    triggerUpdate();
+    data->transform.setAngle(-degrees * M_PI / 180, cx, cy);
+    update();
 }
 
 double Map::getBearing() const {
-    return -transform.getAngle() / M_PI * 180;
+    return -data->transform.getAngle() / M_PI * 180;
 }
 
 void Map::resetNorth() {
-    transform.setAngle(0, std::chrono::milliseconds(500));
-    triggerUpdate();
+    data->transform.setAngle(0, std::chrono::milliseconds(500));
+    update();
 }
 
+
 #pragma mark - Access Token
 
 void Map::setAccessToken(const std::string &token) {
@@ -587,22 +205,45 @@ std::string Map::getAccessToken() const {
     return data->getAccessToken();
 }
 
+
+#pragma mark - Projection
+
+void Map::getWorldBoundsMeters(ProjectedMeters& sw, ProjectedMeters& ne) const {
+    Projection::getWorldBoundsMeters(sw, ne);
+}
+
+void Map::getWorldBoundsLatLng(LatLng& sw, LatLng& ne) const {
+    Projection::getWorldBoundsLatLng(sw, ne);
+}
+
+double Map::getMetersPerPixelAtLatitude(const double lat, const double zoom) const {
+    return Projection::getMetersPerPixelAtLatitude(lat, zoom);
+}
+
+const ProjectedMeters Map::projectedMetersForLatLng(const LatLng latLng) const {
+    return Projection::projectedMetersForLatLng(latLng);
+}
+
+const LatLng Map::latLngForProjectedMeters(const ProjectedMeters projectedMeters) const {
+    return Projection::latLngForProjectedMeters(projectedMeters);
+}
+
+const vec2<double> Map::pixelForLatLng(const LatLng latLng) const {
+    return data->transform.currentState().pixelForLatLng(latLng);
+}
+
+const LatLng Map::latLngForPixel(const vec2<double> pixel) const {
+    return data->transform.currentState().latLngForPixel(pixel);
+}
+
 #pragma mark - Annotations
 
 void Map::setDefaultPointAnnotationSymbol(const std::string& symbol) {
-    assert(Environment::currentlyOn(ThreadType::Main));
-    invokeTask([=] {
-        annotationManager->setDefaultPointAnnotationSymbol(symbol);
-    });
+    data->annotationManager.setDefaultPointAnnotationSymbol(symbol);
 }
 
 double Map::getTopOffsetPixelsForAnnotationSymbol(const std::string& symbol) {
-    assert(Environment::currentlyOn(ThreadType::Main));
-    return invokeSyncTask([&] {
-        assert(sprite);
-        const SpritePosition pos = sprite->getSpritePosition(symbol);
-        return -pos.height / pos.pixelRatio / 2;
-    });
+    return context->invokeSync<double>(&MapContext::getTopOffsetPixelsForAnnotationSymbol, symbol);
 }
 
 uint32_t Map::addPointAnnotation(const LatLng& point, const std::string& symbol) {
@@ -610,87 +251,64 @@ uint32_t Map::addPointAnnotation(const LatLng& point, const std::string& symbol)
 }
 
 std::vector<uint32_t> Map::addPointAnnotations(const std::vector<LatLng>& points, const std::vector<std::string>& symbols) {
-    assert(Environment::currentlyOn(ThreadType::Main));
-    return invokeSyncTask([&] {
-        auto result = annotationManager->addPointAnnotations(points, symbols, *this);
-        updateAnnotationTiles(result.first);
-        return result.second;
-    });
+    auto result = data->annotationManager.addPointAnnotations(points, symbols, *data);
+    context->invoke(&MapContext::updateAnnotationTiles, result.first);
+    return result.second;
 }
 
 void Map::removeAnnotation(uint32_t annotation) {
-    assert(Environment::currentlyOn(ThreadType::Main));
     removeAnnotations({ annotation });
 }
 
 void Map::removeAnnotations(const std::vector<uint32_t>& annotations) {
-    assert(Environment::currentlyOn(ThreadType::Main));
-    invokeTask([=] {
-        auto result = annotationManager->removeAnnotations(annotations, *this);
-        updateAnnotationTiles(result);
-    });
+    auto result = data->annotationManager.removeAnnotations(annotations, *data);
+    context->invoke(&MapContext::updateAnnotationTiles, result);
 }
 
 std::vector<uint32_t> Map::getAnnotationsInBounds(const LatLngBounds& bounds) {
-    assert(Environment::currentlyOn(ThreadType::Main));
-    return invokeSyncTask([&] {
-        return annotationManager->getAnnotationsInBounds(bounds, *this);
-    });
+    return data->annotationManager.getAnnotationsInBounds(bounds, *data);
 }
 
 LatLngBounds Map::getBoundsForAnnotations(const std::vector<uint32_t>& annotations) {
-    assert(Environment::currentlyOn(ThreadType::Main));
-    return invokeSyncTask([&] {
-        return annotationManager->getBoundsForAnnotations(annotations);
-    });
+    return data->annotationManager.getBoundsForAnnotations(annotations);
 }
 
-void Map::updateAnnotationTiles(const std::vector<TileID>& ids) {
-    assert(Environment::currentlyOn(ThreadType::Map));
-    if (!style) return;
-    for (const auto &source : style->sources) {
-        if (source->info.type == SourceType::Annotations) {
-            source->invalidateTiles(ids);
-        }
-    }
-    triggerUpdate();
-}
 
 #pragma mark - Toggles
 
 void Map::setDebug(bool value) {
     data->setDebug(value);
-    triggerUpdate(Update::Debug);
+    update();
 }
 
 void Map::toggleDebug() {
     data->toggleDebug();
-    triggerUpdate(Update::Debug);
+    update();
 }
 
 bool Map::getDebug() const {
     return data->getDebug();
 }
 
-TimePoint Map::getTime() const {
-    return data->getAnimationTime();
+bool Map::isFullyLoaded() const {
+    return data->getFullyLoaded();
 }
 
 void Map::addClass(const std::string& klass) {
     if (data->addClass(klass)) {
-        triggerUpdate(Update::Classes);
+        update(Update::Classes);
     }
 }
 
 void Map::removeClass(const std::string& klass) {
     if (data->removeClass(klass)) {
-        triggerUpdate(Update::Classes);
+        update(Update::Classes);
     }
 }
 
 void Map::setClasses(const std::vector<std::string>& classes) {
     data->setClasses(classes);
-    triggerUpdate(Update::Classes);
+    update(Update::Classes);
 }
 
 bool Map::hasClass(const std::string& klass) const {
@@ -702,185 +320,20 @@ std::vector<std::string> Map::getClasses() const {
 }
 
 void Map::setDefaultTransitionDuration(Duration duration) {
-    assert(Environment::currentlyOn(ThreadType::Main));
-
     data->setDefaultTransitionDuration(duration);
-    triggerUpdate(Update::DefaultTransitionDuration);
+    update(Update::DefaultTransitionDuration);
 }
 
 Duration Map::getDefaultTransitionDuration() {
-    assert(Environment::currentlyOn(ThreadType::Main));
     return data->getDefaultTransitionDuration();
 }
 
-void Map::updateTiles() {
-    assert(Environment::currentlyOn(ThreadType::Map));
-    if (!style) return;
-    for (const auto& source : style->sources) {
-        source->update(*this, getWorker(), style, *glyphAtlas, *glyphStore,
-                               *spriteAtlas, getSprite(), *texturePool, [this]() {
-            assert(Environment::currentlyOn(ThreadType::Map));
-            triggerUpdate();
-        });
-    }
-}
-
-void Map::update() {
-    assert(Environment::currentlyOn(ThreadType::Map));
-
-    if (state.hasSize()) {
-        prepare();
-    }
-}
-
-void Map::reloadStyle() {
-    assert(Environment::currentlyOn(ThreadType::Map));
-
-    style = std::make_shared<Style>();
-
-    const auto styleInfo = data->getStyleInfo();
-
-    if (!styleInfo.url.empty()) {
-        const auto base = styleInfo.base;
-        // We have a style URL
-        env->request({ Resource::Kind::JSON, styleInfo.url }, [this, base](const Response &res) {
-            if (res.status == Response::Successful) {
-                loadStyleJSON(res.data, base);
-            } else {
-                Log::Error(Event::Setup, "loading style failed: %s", res.message.c_str());
-            }
-        });
-    } else if (!styleInfo.json.empty()) {
-        // We got JSON data directly.
-        loadStyleJSON(styleInfo.json, styleInfo.base);
-    }
-}
-
-void Map::loadStyleJSON(const std::string& json, const std::string& base) {
-    assert(Environment::currentlyOn(ThreadType::Map));
-
-    sprite.reset();
-    style = std::make_shared<Style>();
-    style->base = base;
-    style->loadJSON((const uint8_t *)json.c_str());
-    style->cascade(data->getClasses());
-    style->setDefaultTransitionDuration(data->getDefaultTransitionDuration());
-
-    const std::string glyphURL = util::mapbox::normalizeGlyphsURL(style->glyph_url, getAccessToken());
-    glyphStore->setURL(glyphURL);
-
-    for (const auto& source : style->sources) {
-        source->load(getAccessToken(), *env, [this]() {
-            assert(Environment::currentlyOn(ThreadType::Map));
-            triggerUpdate();
-        });
-    }
-
-    triggerUpdate(Update::Zoom);
-}
-
-void Map::prepare() {
-    assert(Environment::currentlyOn(ThreadType::Map));
-
-    const auto now = Clock::now();
-    data->setAnimationTime(now);
-
-    auto u = updated.exchange(static_cast<UpdateType>(Update::Nothing)) |
-             transform.updateTransitions(now);
-
-    if (!style) {
-        u |= static_cast<UpdateType>(Update::StyleInfo);
-    }
-
-    state = transform.currentState();
-
-    if (u & static_cast<UpdateType>(Update::StyleInfo)) {
-        reloadStyle();
-    }
-
-    if (u & static_cast<UpdateType>(Update::Debug)) {
-        assert(painter);
-        painter->setDebug(data->getDebug());
-    }
-
-    if (u & static_cast<UpdateType>(Update::RenderStill)) {
-        // Triggers a view resize.
-        view.discard();
-
-        // Whenever we trigger an image render, we are unrefing all async handles so the loop will
-        // eventually terminate. However, it'll stay alive as long as there are pending requests
-        // (like work requests or HTTP requests).
-        asyncTerminate->unref();
-        asyncUpdate->unref();
-        asyncInvoke->unref();
-        asyncRender->unref();
-    }
-
-    if (style) {
-        if (u & static_cast<UpdateType>(Update::DefaultTransitionDuration)) {
-            style->setDefaultTransitionDuration(data->getDefaultTransitionDuration());
-        }
-
-        if (u & static_cast<UpdateType>(Update::Classes)) {
-            style->cascade(data->getClasses());
-        }
-
-        if (u & static_cast<UpdateType>(Update::StyleInfo) ||
-            u & static_cast<UpdateType>(Update::Classes) ||
-            u & static_cast<UpdateType>(Update::Zoom)) {
-            style->recalculate(state.getNormalizedZoom(), now);
-        }
-
-        // Allow the sprite atlas to potentially pull new sprite images if needed.
-        spriteAtlas->resize(state.getPixelRatio());
-        spriteAtlas->setSprite(getSprite());
-
-        updateTiles();
-    }
-
-    if (mode == Mode::Continuous) {
-        view.invalidate();
-    }
-}
-
-void Map::render() {
-    assert(Environment::currentlyOn(ThreadType::Map));
-
-    view.discard();
-
-    // Cleanup OpenGL objects that we abandoned since the last render call.
-    env->performCleanup();
-
-    assert(style);
-    assert(painter);
-
-    painter->render(*style, state, data->getAnimationTime());
-
-    // Schedule another rerender when we definitely need a next frame.
-    if (transform.needsTransition() || style->hasTransitions()) {
-        triggerUpdate();
-    }
-}
-
 void Map::setSourceTileCacheSize(size_t size) {
-    if (size != getSourceTileCacheSize()) {
-        invokeTask([=] {
-            sourceCacheSize = size;
-            if (!style) return;
-            for (const auto &source : style->sources) {
-                source->setCacheSize(sourceCacheSize);
-            }
-            env->performCleanup();
-        });
-    }
+    context->invoke(&MapContext::setSourceTileCacheSize, size);
 }
 
 void Map::onLowMemory() {
-    invokeTask([=] {
-        if (!style) return;
-        for (const auto &source : style->sources) {
-            source->onLowMemory();
-        }
-        env->performCleanup();
-    });
-};
+    context->invoke(&MapContext::onLowMemory);
+}
+
+}
diff --git a/src/mbgl/map/map_context.cpp b/src/mbgl/map/map_context.cpp
new file mode 100644
index 000000000..f373274eb
--- /dev/null
+++ b/src/mbgl/map/map_context.cpp
@@ -0,0 +1,277 @@
+#include <mbgl/map/map_context.hpp>
+#include <mbgl/map/map_data.hpp>
+#include <mbgl/map/view.hpp>
+#include <mbgl/map/environment.hpp>
+#include <mbgl/map/source.hpp>
+#include <mbgl/map/still_image.hpp>
+
+#include <mbgl/platform/log.hpp>
+
+#include <mbgl/renderer/painter.hpp>
+
+#include <mbgl/text/glyph_store.hpp>
+
+#include <mbgl/geometry/glyph_atlas.hpp>
+#include <mbgl/geometry/sprite_atlas.hpp>
+#include <mbgl/geometry/line_atlas.hpp>
+
+#include <mbgl/storage/resource.hpp>
+#include <mbgl/storage/response.hpp>
+
+#include <mbgl/style/style.hpp>
+
+#include <mbgl/util/std.hpp>
+#include <mbgl/util/uv_detail.hpp>
+#include <mbgl/util/worker.hpp>
+#include <mbgl/util/texture_pool.hpp>
+#include <mbgl/util/mapbox.hpp>
+#include <mbgl/util/exception.hpp>
+
+namespace mbgl {
+
+MapContext::MapContext(uv_loop_t* loop, View& view_, FileSource& fileSource, MapData& data_)
+    : view(view_),
+      data(data_),
+      env(fileSource),
+      envScope(env, ThreadType::Map, "Map"),
+      updated(static_cast<UpdateType>(Update::Nothing)),
+      asyncUpdate(util::make_unique<uv::async>(loop, [this] { update(); })),
+      glyphStore(util::make_unique<GlyphStore>(loop, env)),
+      glyphAtlas(util::make_unique<GlyphAtlas>(1024, 1024)),
+      spriteAtlas(util::make_unique<SpriteAtlas>(512, 512)),
+      lineAtlas(util::make_unique<LineAtlas>(512, 512)),
+      texturePool(util::make_unique<TexturePool>()) {
+    assert(Environment::currentlyOn(ThreadType::Map));
+
+    asyncUpdate->unref();
+
+    view.activate();
+}
+
+MapContext::~MapContext() {
+    view.notify();
+
+    // Explicit resets currently necessary because these abandon resources that need to be
+    // cleaned up by env.performCleanup();
+    resourceLoader.reset();
+    style.reset();
+    painter.reset();
+    texturePool.reset();
+    lineAtlas.reset();
+    spriteAtlas.reset();
+    glyphAtlas.reset();
+    glyphStore.reset();
+
+    env.performCleanup();
+
+    view.deactivate();
+}
+
+void MapContext::pause() {
+    MBGL_CHECK_ERROR(glFinish());
+
+    view.deactivate();
+
+    std::unique_lock<std::mutex> lockPause(data.mutexPause);
+    data.condPaused.notify_all();
+    data.condResume.wait(lockPause);
+
+    view.activate();
+}
+
+void MapContext::resize(uint16_t width, uint16_t height, float ratio) {
+    view.resize(width, height, ratio);
+    triggerUpdate();
+}
+
+void MapContext::triggerUpdate(const Update u) {
+    updated |= static_cast<UpdateType>(u);
+    asyncUpdate->send();
+}
+
+void MapContext::setStyleURL(const std::string& url) {
+    styleURL = mbgl::util::mapbox::normalizeStyleURL(url, data.getAccessToken());
+    styleJSON.clear();
+
+    const size_t pos = styleURL.rfind('/');
+    std::string base = "";
+    if (pos != std::string::npos) {
+        base = styleURL.substr(0, pos + 1);
+    }
+
+    env.request({ Resource::Kind::JSON, styleURL }, [this, base](const Response &res) {
+        if (res.status == Response::Successful) {
+            loadStyleJSON(res.data, base);
+        } else {
+            Log::Error(Event::Setup, "loading style failed: %s", res.message.c_str());
+        }
+    });
+}
+
+void MapContext::setStyleJSON(const std::string& json, const std::string& base) {
+    styleURL.clear();
+    styleJSON = json;
+
+    loadStyleJSON(json, base);
+}
+
+void MapContext::loadStyleJSON(const std::string& json, const std::string& base) {
+    assert(Environment::currentlyOn(ThreadType::Map));
+
+    resourceLoader.reset();
+    style.reset();
+
+    style = util::make_unique<Style>();
+    style->base = base;
+    style->loadJSON((const uint8_t *)json.c_str());
+    style->cascade(data.getClasses());
+    style->setDefaultTransitionDuration(data.getDefaultTransitionDuration());
+
+    const std::string glyphURL = util::mapbox::normalizeGlyphsURL(style->glyph_url, data.getAccessToken());
+    glyphStore->setURL(glyphURL);
+
+    resourceLoader = util::make_unique<ResourceLoader>();
+    resourceLoader->setAccessToken(data.getAccessToken());
+    resourceLoader->setObserver(this);
+    resourceLoader->setStyle(style.get());
+    resourceLoader->setGlyphStore(glyphStore.get());
+
+    triggerUpdate(Update::Zoom);
+}
+
+void MapContext::updateTiles() {
+    assert(Environment::currentlyOn(ThreadType::Map));
+
+    resourceLoader->update(data, transformState, *glyphAtlas, *spriteAtlas, *texturePool);
+}
+
+void MapContext::updateAnnotationTiles(const std::vector<TileID>& ids) {
+    assert(Environment::currentlyOn(ThreadType::Map));
+    if (!style) return;
+    for (const auto &source : style->sources) {
+        if (source->info.type == SourceType::Annotations) {
+            source->invalidateTiles(ids);
+        }
+    }
+    triggerUpdate();
+}
+
+void MapContext::update() {
+    assert(Environment::currentlyOn(ThreadType::Map));
+
+    const auto now = Clock::now();
+    data.setAnimationTime(now);
+
+    updated |= data.transform.updateTransitions(now);
+    transformState = data.transform.currentState();
+
+    if (style) {
+        if (updated & static_cast<UpdateType>(Update::DefaultTransitionDuration)) {
+            style->setDefaultTransitionDuration(data.getDefaultTransitionDuration());
+        }
+
+        if (updated & static_cast<UpdateType>(Update::Classes)) {
+            style->cascade(data.getClasses());
+        }
+
+        if (updated & static_cast<UpdateType>(Update::Classes) ||
+            updated & static_cast<UpdateType>(Update::Zoom)) {
+            style->recalculate(transformState.getNormalizedZoom(), now);
+        }
+
+        updateTiles();
+
+        if (style->isLoaded() && resourceLoader->getSprite()->isLoaded()) {
+            if (!data.getFullyLoaded()) {
+                data.setFullyLoaded(true);
+            }
+        } else {
+            if (data.getFullyLoaded()) {
+                data.setFullyLoaded(false);
+            }
+        }
+
+        view.invalidate([this] { render(); });
+    }
+
+    updated = static_cast<UpdateType>(Update::Nothing);
+}
+
+void MapContext::renderStill(StillImageCallback fn) {
+    if (data.mode != MapMode::Still) {
+        throw util::Exception("Map is not in still image render mode");
+    }
+
+    if (callback) {
+        throw util::Exception("Map is currently rendering an image");
+    }
+
+    callback = fn;
+    triggerUpdate(Update::RenderStill);
+}
+
+void MapContext::render() {
+    assert(Environment::currentlyOn(ThreadType::Map));
+
+    // Cleanup OpenGL objects that we abandoned since the last render call.
+    env.performCleanup();
+
+    if (data.mode == MapMode::Still && (!callback || !data.getFullyLoaded())) {
+        // We are either not waiting for a map to be rendered, or we don't have all resources yet.
+        return;
+    }
+
+    assert(style);
+
+    if (!painter) {
+        painter = util::make_unique<Painter>(*spriteAtlas, *glyphAtlas, *lineAtlas);
+        painter->setup();
+    }
+
+    painter->setDebug(data.getDebug());
+    painter->render(*style, transformState, data.getAnimationTime());
+
+    if (data.mode == MapMode::Still) {
+        callback(view.readStillImage());
+        callback = nullptr;
+    }
+
+    // Schedule another rerender when we definitely need a next frame.
+    if (data.transform.needsTransition() || style->hasTransitions()) {
+        triggerUpdate();
+    }
+}
+
+double MapContext::getTopOffsetPixelsForAnnotationSymbol(const std::string& symbol) {
+    assert(Environment::currentlyOn(ThreadType::Map));
+    const SpritePosition pos = resourceLoader->getSprite()->getSpritePosition(symbol);
+    return -pos.height / pos.pixelRatio / 2;
+}
+
+void MapContext::setSourceTileCacheSize(size_t size) {
+    assert(Environment::currentlyOn(ThreadType::Map));
+    if (size != sourceCacheSize) {
+        sourceCacheSize = size;
+        if (!style) return;
+        for (const auto &source : style->sources) {
+            source->setCacheSize(sourceCacheSize);
+        }
+        view.invalidate([this] { render(); });
+    }
+}
+
+void MapContext::onLowMemory() {
+    assert(Environment::currentlyOn(ThreadType::Map));
+    if (!style) return;
+    for (const auto &source : style->sources) {
+        source->onLowMemory();
+    }
+    view.invalidate([this] { render(); });
+}
+
+void MapContext::onTileDataChanged() {
+    assert(Environment::currentlyOn(ThreadType::Map));
+    triggerUpdate();
+}
+
+}
diff --git a/src/mbgl/map/map_context.hpp b/src/mbgl/map/map_context.hpp
new file mode 100644
index 000000000..c84245484
--- /dev/null
+++ b/src/mbgl/map/map_context.hpp
@@ -0,0 +1,102 @@
+#ifndef MBGL_MAP_MAP_CONTEXT
+#define MBGL_MAP_MAP_CONTEXT
+
+#include <mbgl/map/tile_id.hpp>
+#include <mbgl/map/update.hpp>
+#include <mbgl/map/environment.hpp>
+#include <mbgl/map/resource_loader.hpp>
+#include <mbgl/map/transform_state.hpp>
+#include <mbgl/util/ptr.hpp>
+
+#include <vector>
+
+typedef struct uv_loop_s uv_loop_t;
+
+namespace uv {
+class async;
+}
+
+namespace mbgl {
+
+class View;
+class MapData;
+class GlyphStore;
+class GlyphAtlas;
+class SpriteAtlas;
+class LineAtlas;
+class TexturePool;
+class Painter;
+class Sprite;
+class Style;
+class Worker;
+class StillImage;
+struct LatLng;
+struct LatLngBounds;
+
+class MapContext : public ResourceLoader::Observer {
+public:
+    MapContext(uv_loop_t*, View&, FileSource&, MapData&);
+    ~MapContext();
+
+    void pause();
+    void render();
+
+    void resize(uint16_t width, uint16_t height, float ratio);
+
+    using StillImageCallback = std::function<void(std::unique_ptr<const StillImage>)>;
+    void renderStill(StillImageCallback callback);
+
+    void triggerUpdate(Update = Update::Nothing);
+
+    void setStyleURL(const std::string&);
+    void setStyleJSON(const std::string& json, const std::string& base);
+    std::string getStyleURL() const { return styleURL; }
+    std::string getStyleJSON() const { return styleJSON; }
+
+    double getTopOffsetPixelsForAnnotationSymbol(const std::string& symbol);
+    void updateAnnotationTiles(const std::vector<TileID>&);
+
+    void setSourceTileCacheSize(size_t size);
+    void onLowMemory();
+
+    // ResourceLoader::Observer implementation.
+    void onTileDataChanged() override;
+
+private:
+    void updateTiles();
+
+    // Update the state indicated by the accumulated Update flags, then render.
+    void update();
+
+    // Loads the actual JSON object an creates a new Style object.
+    void loadStyleJSON(const std::string& json, const std::string& base);
+
+    View& view;
+    MapData& data;
+
+    Environment env;
+    EnvironmentScope envScope;
+
+    UpdateType updated { static_cast<UpdateType>(Update::Nothing) };
+    std::unique_ptr<uv::async> asyncUpdate;
+
+    std::unique_ptr<GlyphStore> glyphStore;
+    std::unique_ptr<GlyphAtlas> glyphAtlas;
+    std::unique_ptr<SpriteAtlas> spriteAtlas;
+    std::unique_ptr<LineAtlas> lineAtlas;
+    std::unique_ptr<TexturePool> texturePool;
+    std::unique_ptr<Painter> painter;
+    std::unique_ptr<Style> style;
+    std::unique_ptr<ResourceLoader> resourceLoader;
+
+    std::string styleURL;
+    std::string styleJSON;
+
+    StillImageCallback callback;
+    size_t sourceCacheSize;
+    TransformState transformState;
+};
+
+}
+
+#endif
diff --git a/src/mbgl/map/map_data.hpp b/src/mbgl/map/map_data.hpp
index 718c3eb0e..54114b9d0 100644
--- a/src/mbgl/map/map_data.hpp
+++ b/src/mbgl/map/map_data.hpp
@@ -7,33 +7,26 @@
 #include <mutex>
 #include <atomic>
 #include <vector>
+#include <cassert>
+#include <condition_variable>
+
+#include <mbgl/map/mode.hpp>
+#include <mbgl/map/environment.hpp>
+#include <mbgl/map/transform.hpp>
+#include <mbgl/map/transform_state.hpp>
+#include <mbgl/map/annotation.hpp>
 
 namespace mbgl {
 
-struct StyleInfo {
-    std::string url;
-    std::string base;
-    std::string json;
-};
-
 class MapData {
     using Lock = std::lock_guard<std::mutex>;
 
 public:
-    inline MapData() {
+    inline MapData(View& view, MapMode mode_) : transform(view), mode(mode_) {
         setAnimationTime(TimePoint::min());
         setDefaultTransitionDuration(Duration::zero());
     }
 
-    inline StyleInfo getStyleInfo() const {
-        Lock lock(mtx);
-        return styleInfo;
-    }
-    inline void setStyleInfo(StyleInfo&& info) {
-        Lock lock(mtx);
-        styleInfo = info;
-    }
-
     inline std::string getAccessToken() const {
         Lock lock(mtx);
         return accessToken;
@@ -71,6 +64,13 @@ public:
         debug = value;
     }
 
+    inline bool getFullyLoaded() const {
+        return loaded;
+    }
+    inline void setFullyLoaded(bool value) {
+        loaded = value;
+    }
+
     inline TimePoint getAnimationTime() const {
         // We're casting the TimePoint to and from a Duration because libstdc++
         // has a bug that doesn't allow TimePoints to be atomic.
@@ -87,15 +87,26 @@ public:
         defaultTransitionDuration = duration;
     };
 
+public:
+    Transform transform;
+    AnnotationManager annotationManager;
+    const MapMode mode;
+
 private:
     mutable std::mutex mtx;
 
-    StyleInfo styleInfo;
     std::string accessToken;
     std::vector<std::string> classes;
     std::atomic<uint8_t> debug { false };
+    std::atomic<bool> loaded { false };
     std::atomic<Duration> animationTime;
     std::atomic<Duration> defaultTransitionDuration;
+
+// TODO: make private
+public:
+    std::mutex mutexPause;
+    std::condition_variable condPaused;
+    std::condition_variable condResume;
 };
 
 }
diff --git a/src/mbgl/map/raster_tile_data.cpp b/src/mbgl/map/raster_tile_data.cpp
index 2531f5130..0f8efe3b4 100644
--- a/src/mbgl/map/raster_tile_data.cpp
+++ b/src/mbgl/map/raster_tile_data.cpp
@@ -1,4 +1,3 @@
-#include <mbgl/map/map.hpp>
 #include <mbgl/map/raster_tile_data.hpp>
 #include <mbgl/style/style.hpp>
 
@@ -10,24 +9,23 @@ RasterTileData::RasterTileData(const TileID& id_, TexturePool &texturePool,
 }
 
 RasterTileData::~RasterTileData() {
+    // Cancel in most derived class destructor so that worker tasks are joined before
+    // any member data goes away.
+    cancel();
 }
 
 void RasterTileData::parse() {
-    if (state != State::loaded) {
+    if (getState() != State::loaded) {
         return;
     }
 
     if (bucket.setImage(data)) {
-        state = State::parsed;
+        setState(State::parsed);
     } else {
-        state = State::invalid;
+        setState(State::invalid);
     }
 }
 
-void RasterTileData::render(Painter &painter, const StyleLayer &layer_desc, const mat4 &matrix) {
-    bucket.render(painter, layer_desc, id, matrix);
-}
-
-bool RasterTileData::hasData(StyleLayer const& /*layer_desc*/) const {
-    return bucket.hasData();
+Bucket* RasterTileData::getBucket(StyleLayer const&) {
+    return &bucket;
 }
diff --git a/src/mbgl/map/raster_tile_data.hpp b/src/mbgl/map/raster_tile_data.hpp
index dab2b7b84..45aee8f74 100644
--- a/src/mbgl/map/raster_tile_data.hpp
+++ b/src/mbgl/map/raster_tile_data.hpp
@@ -20,8 +20,7 @@ public:
     ~RasterTileData();
 
     void parse() override;
-    void render(Painter &painter, const StyleLayer &layer_desc, const mat4 &matrix) override;
-    bool hasData(StyleLayer const &layer_desc) const override;
+    Bucket* getBucket(StyleLayer const &layer_desc) override;
 
 protected:
     StyleLayoutRaster layout;
diff --git a/src/mbgl/map/resource_loader.cpp b/src/mbgl/map/resource_loader.cpp
new file mode 100644
index 000000000..2be86dc5e
--- /dev/null
+++ b/src/mbgl/map/resource_loader.cpp
@@ -0,0 +1,133 @@
+#include <mbgl/map/resource_loader.hpp>
+
+#include <mbgl/geometry/sprite_atlas.hpp>
+#include <mbgl/map/environment.hpp>
+#include <mbgl/map/source.hpp>
+#include <mbgl/map/sprite.hpp>
+#include <mbgl/map/transform.hpp>
+#include <mbgl/style/style.hpp>
+
+#include <cassert>
+
+namespace mbgl {
+
+ResourceLoader::ResourceLoader() {
+    assert(Environment::currentlyOn(ThreadType::Map));
+}
+
+ResourceLoader::~ResourceLoader() {
+    assert(Environment::currentlyOn(ThreadType::Map));
+
+    for (const auto& source : style_->sources) {
+        source->setObserver(nullptr);
+    }
+
+    if (sprite_) {
+        sprite_->setObserver(nullptr);
+    }
+
+    if (glyphStore_) {
+        glyphStore_->setObserver(nullptr);
+    }
+}
+
+void ResourceLoader::setObserver(Observer* observer) {
+    assert(Environment::currentlyOn(ThreadType::Map));
+    assert(!observer_);
+
+    observer_ = observer;
+}
+
+void ResourceLoader::setStyle(Style* style) {
+    assert(style);
+
+    style_ = style;
+
+    for (const auto& source : style->sources) {
+        source->setObserver(this);
+        source->load(accessToken_);
+    }
+}
+
+void ResourceLoader::setGlyphStore(GlyphStore* glyphStore) {
+    assert(glyphStore);
+
+    if (glyphStore_) {
+        glyphStore_->setObserver(nullptr);
+    }
+
+    glyphStore_ = glyphStore;
+    glyphStore_->setObserver(this);
+}
+
+
+void ResourceLoader::setAccessToken(const std::string& accessToken) {
+    accessToken_ = accessToken;
+}
+
+void ResourceLoader::update(MapData& data,
+                            const TransformState& transform,
+                            GlyphAtlas& glyphAtlas,
+                            SpriteAtlas& spriteAtlas,
+                            TexturePool& texturePool) {
+    if (!style_) {
+        return;
+    }
+
+    const float pixelRatio = transform.getPixelRatio();
+    if (!sprite_ || !sprite_->hasPixelRatio(pixelRatio)) {
+        sprite_ = util::make_unique<Sprite>(style_->getSpriteURL(), pixelRatio);
+        sprite_->setObserver(this);
+
+        spriteAtlas.resize(pixelRatio);
+        spriteAtlas.setSprite(sprite_);
+    }
+
+    bool allTilesUpdated = true;
+    for (const auto& source : style_->sources) {
+        if (!source->update(data, transform, *style_, glyphAtlas, *glyphStore_,
+                       spriteAtlas, sprite_, texturePool, shouldReparsePartialTiles_)) {
+            allTilesUpdated = false;
+        }
+    }
+
+    // We can only stop updating "partial" tiles when all of them
+    // were notified of the arrival of the new resources.
+    if (allTilesUpdated) {
+        shouldReparsePartialTiles_ = false;
+    }
+}
+
+void ResourceLoader::onGlyphRangeLoaded() {
+    shouldReparsePartialTiles_ = true;
+
+    emitTileDataChanged();
+}
+
+void ResourceLoader::onSourceLoaded() {
+    emitTileDataChanged();
+}
+
+void ResourceLoader::onTileLoaded(bool isNewTile) {
+    if (isNewTile) {
+        shouldReparsePartialTiles_ = true;
+    }
+
+    emitTileDataChanged();
+}
+
+void ResourceLoader::onSpriteLoaded() {
+    shouldReparsePartialTiles_ = true;
+
+    emitTileDataChanged();
+}
+
+void ResourceLoader::emitTileDataChanged() {
+    assert(Environment::currentlyOn(ThreadType::Map));
+
+    if (observer_) {
+        observer_->onTileDataChanged();
+    }
+}
+
+}
diff --git a/src/mbgl/map/resource_loader.hpp b/src/mbgl/map/resource_loader.hpp
new file mode 100644
index 000000000..379444135
--- /dev/null
+++ b/src/mbgl/map/resource_loader.hpp
@@ -0,0 +1,89 @@
+#ifndef MBGL_MAP_RESOURCE_LOADER
+#define MBGL_MAP_RESOURCE_LOADER
+
+#include <mbgl/map/source.hpp>
+#include <mbgl/map/sprite.hpp>
+#include <mbgl/text/glyph_store.hpp>
+#include <mbgl/util/noncopyable.hpp>
+
+#include <string>
+
+namespace mbgl {
+
+class GlyphAtlas;
+class GlyphStore;
+class MapData;
+class SpriteAtlas;
+class Style;
+class TexturePool;
+class TransformState;
+
+// ResourceLoader is responsible for loading and updating the Source(s) owned
+// by the Style. The Source object currently owns all the tiles, thus this
+// class will notify its observers of any change on these tiles which will
+// ultimately cause a new rendering to be triggered.
+class ResourceLoader : public GlyphStore::Observer,
+                       public Source::Observer,
+                       public Sprite::Observer,
+                       private util::noncopyable {
+public:
+    class Observer {
+    public:
+        virtual ~Observer() = default;
+
+        virtual void onTileDataChanged() = 0;
+    };
+
+    ResourceLoader();
+    ~ResourceLoader();
+
+    void setObserver(Observer* observer);
+
+    // The style object currently owns all the sources. When setting
+    // a new style we will go through all of them and try to load.
+    void setStyle(Style* style);
+
+    // TODO: Move GlyphStore to ResourceLoader. We cannot do it now
+    // because we reset the ResourceLoader every time we change the
+    // style.
+    void setGlyphStore(GlyphStore* glyphStore);
+
+    // Set the access token to be used for loading the tile data.
+    void setAccessToken(const std::string& accessToken);
+
+    // Fetch the tiles needed by the current viewport and emit a signal when
+    // a tile is ready so observers can render the tile.
+    void update(MapData&, const TransformState&, GlyphAtlas&, SpriteAtlas&, TexturePool&);
+
+    // FIXME: There is probably a better place for this.
+    inline util::ptr<Sprite> getSprite() const {
+        return sprite_;
+    }
+
+    // GlyphStore::Observer implementation.
+    void onGlyphRangeLoaded() override;
+
+    // Source::Observer implementation.
+    void onSourceLoaded() override;
+    void onTileLoaded(bool isNewTile) override;
+
+    // Sprite::Observer implementation.
+    void onSpriteLoaded() override;
+
+private:
+    void emitTileDataChanged();
+
+    bool shouldReparsePartialTiles_ = false;
+
+    std::string accessToken_;
+    util::ptr<Sprite> sprite_;
+
+    GlyphStore* glyphStore_ = nullptr;
+    Style* style_ = nullptr;
+
+    Observer* observer_ = nullptr;
+};
+
+}
+
+#endif
diff --git a/src/mbgl/map/source.cpp b/src/mbgl/map/source.cpp
index 9e318964b..e8dc3468d 100644
--- a/src/mbgl/map/source.cpp
+++ b/src/mbgl/map/source.cpp
@@ -1,30 +1,27 @@
 #include <mbgl/map/source.hpp>
-#include <mbgl/map/map.hpp>
+#include <mbgl/map/map_data.hpp>
 #include <mbgl/map/environment.hpp>
 #include <mbgl/map/transform.hpp>
 #include <mbgl/map/tile.hpp>
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/util/constants.hpp>
-#include <mbgl/util/raster.hpp>
-#include <mbgl/util/string.hpp>
-#include <mbgl/util/texture_pool.hpp>
 #include <mbgl/storage/resource.hpp>
 #include <mbgl/storage/response.hpp>
-#include <mbgl/util/vec.hpp>
 #include <mbgl/util/math.hpp>
-#include <mbgl/util/std.hpp>
 #include <mbgl/util/box.hpp>
 #include <mbgl/util/mapbox.hpp>
-#include <mbgl/geometry/glyph_atlas.hpp>
 #include <mbgl/style/style_layer.hpp>
 #include <mbgl/platform/log.hpp>
 #include <mbgl/util/uv_detail.hpp>
 #include <mbgl/util/token.hpp>
+#include <mbgl/util/string.hpp>
 #include <mbgl/util/tile_cover.hpp>
 
 #include <mbgl/map/vector_tile_data.hpp>
 #include <mbgl/map/raster_tile_data.hpp>
 #include <mbgl/map/live_tile_data.hpp>
+#include <mbgl/style/style.hpp>
+#include <mbgl/gl/debugging.hpp>
 
 #include <algorithm>
 
@@ -117,27 +114,41 @@ std::string SourceInfo::tileURL(const TileID& id, float pixelRatio) const {
     return result;
 }
 
-Source::Source()
-{
+Source::Source() {}
+
+Source::~Source() {
+    if (req) {
+        Environment::Get().cancelRequest(req);
+    }
 }
 
-Source::~Source() {}
+bool Source::isLoaded() const {
+    if (!loaded) {
+        return false;
+    }
+
+    for (const auto& tile : tiles) {
+        if (tile.second->data->getState() != TileData::State::parsed) {
+            return false;
+        }
+    }
+
+    return true;
+}
 
 // Note: This is a separate function that must be called exactly once after creation
 // The reason this isn't part of the constructor is that calling shared_from_this() in
 // the constructor fails.
-void Source::load(const std::string& accessToken,
-                  Environment& env,
-                  std::function<void()> callback) {
+void Source::load(const std::string& accessToken) {
     if (info.url.empty()) {
         loaded = true;
         return;
     }
 
-    util::ptr<Source> source = shared_from_this();
-
     const std::string url = util::mapbox::normalizeSourceURL(info.url, accessToken);
-    env.request({ Resource::Kind::JSON, url }, [source, callback](const Response &res) {
+    req = Environment::Get().request({ Resource::Kind::JSON, url }, [this](const Response &res) {
+        req = nullptr;
+
         if (res.status != Response::Successful) {
             Log::Warning(Event::General, "Failed to load source TileJSON: %s", res.message.c_str());
             return;
@@ -147,14 +158,14 @@ void Source::load(const std::string& accessToken,
         d.Parse<0>(res.data.c_str());
 
         if (d.HasParseError()) {
-            Log::Warning(Event::General, "Invalid source TileJSON; Parse Error at %d: %s", d.GetErrorOffset(), d.GetParseError());
+            Log::Error(Event::General, "Invalid source TileJSON; Parse Error at %d: %s", d.GetErrorOffset(), d.GetParseError());
             return;
         }
 
-        source->info.parseTileJSONProperties(d);
-        source->loaded = true;
+        info.parseTileJSONProperties(d);
+        loaded = true;
 
-        callback();
+        emitSourceLoaded();
     });
 }
 
@@ -169,21 +180,11 @@ void Source::updateMatrices(const mat4 &projMatrix, const TransformState &transf
 void Source::drawClippingMasks(Painter &painter) {
     for (const auto& pair : tiles) {
         Tile &tile = *pair.second;
-        gl::group group(std::string { "mask: " } + std::string(tile.id));
+        gl::debugging::group group(std::string { "mask: " } + std::string(tile.id));
         painter.drawClippingMask(tile.matrix, tile.clip);
     }
 }
 
-void Source::render(Painter &painter, const StyleLayer &layer_desc) {
-    gl::group group(std::string { "layer: " } + layer_desc.id);
-    for (const auto& pair : tiles) {
-        Tile &tile = *pair.second;
-        if (tile.data && tile.data->state == TileData::State::parsed) {
-            painter.renderTileLayer(tile, layer_desc, tile.matrix);
-        }
-    }
-}
-
 void Source::finishRender(Painter &painter) {
     for (const auto& pair : tiles) {
         Tile &tile = *pair.second;
@@ -191,35 +192,68 @@ void Source::finishRender(Painter &painter) {
     }
 }
 
-std::forward_list<Tile *> Source::getLoadedTiles() const {
-    std::forward_list<Tile *> ptrs;
+std::forward_list<Tile*> Source::getLoadedTiles() const {
+    std::forward_list<Tile*> ptrs;
     auto it = ptrs.before_begin();
-    for (const auto &pair : tiles) {
-        if (pair.second->data->ready()) {
+    for (const auto& pair : tiles) {
+        if (pair.second->data->isReady()) {
             it = ptrs.insert_after(it, pair.second.get());
         }
     }
     return ptrs;
 }
 
+const std::vector<Tile*>& Source::getTiles() const {
+    return tilePtrs;
+}
 
 TileData::State Source::hasTile(const TileID& id) {
     auto it = tiles.find(id);
     if (it != tiles.end()) {
-        Tile &tile = *it->second;
+        Tile& tile = *it->second;
         if (tile.id == id && tile.data) {
-            return tile.data->state;
+            return tile.data->getState();
         }
     }
 
     return TileData::State::invalid;
 }
 
-TileData::State Source::addTile(Map &map, Worker &worker,
-                                util::ptr<Style> style, GlyphAtlas &glyphAtlas,
-                                GlyphStore &glyphStore, SpriteAtlas &spriteAtlas,
-                                util::ptr<Sprite> sprite, TexturePool &texturePool,
-                                const TileID &id, std::function<void()> callback) {
+bool Source::handlePartialTile(const TileID& id, Worker& worker) {
+    const TileID normalized_id = id.normalized();
+
+    auto it = tile_data.find(normalized_id);
+    if (it == tile_data.end()) {
+        return true;
+    }
+
+    util::ptr<TileData> data = it->second.lock();
+    if (!data) {
+        return true;
+    }
+
+    // The signal is only emitted if there was an actual change on the tile. The
+    // tile can be in a "partial" state waiting for resources and get reparsed on
+    // the arrival of new resources that were needed by another tile.
+    size_t bucketCount = static_cast<VectorTileData*>(data.get())->countBuckets();
+    auto callback = [this, data, bucketCount]() {
+        if (static_cast<VectorTileData*>(data.get())->countBuckets() > bucketCount) {
+            emitTileLoaded(false);
+        }
+    };
+
+    return data->reparse(worker, callback);
+}
+
+TileData::State Source::addTile(MapData& data,
+                                const TransformState& transformState,
+                                Style& style,
+                                GlyphAtlas& glyphAtlas,
+                                GlyphStore& glyphStore,
+                                SpriteAtlas& spriteAtlas,
+                                util::ptr<Sprite> sprite,
+                                TexturePool& texturePool,
+                                const TileID& id) {
     const TileData::State state = hasTile(id);
 
     if (state != TileData::State::invalid) {
@@ -239,7 +273,7 @@ TileData::State Source::addTile(Map &map, Worker &worker,
         new_tile.data = it->second.lock();
     }
 
-    if (new_tile.data && new_tile.data->state == TileData::State::obsolete) {
+    if (new_tile.data && new_tile.data->getState() == TileData::State::obsolete) {
         // Do not consider the tile if it's already obsolete.
         new_tile.data.reset();
     }
@@ -248,29 +282,29 @@ TileData::State Source::addTile(Map &map, Worker &worker,
         new_tile.data = cache.get(normalized_id.to_uint64());
     }
 
+    auto callback = std::bind(&Source::emitTileLoaded, this, true);
     if (!new_tile.data) {
         // If we don't find working tile data, we're just going to load it.
         if (info.type == SourceType::Vector) {
             new_tile.data =
-                std::make_shared<VectorTileData>(normalized_id, map.getMaxZoom(), style, glyphAtlas,
+                std::make_shared<VectorTileData>(normalized_id, data.transform.getMaxZoom(), style, glyphAtlas,
                                                  glyphStore, spriteAtlas, sprite, info);
-            new_tile.data->request(worker, map.getState().getPixelRatio(), callback);
+            new_tile.data->request(style.workers, transformState.getPixelRatio(), callback);
         } else if (info.type == SourceType::Raster) {
             new_tile.data = std::make_shared<RasterTileData>(normalized_id, texturePool, info);
-            new_tile.data->request(worker, map.getState().getPixelRatio(), callback);
+            new_tile.data->request(style.workers, transformState.getPixelRatio(), callback);
         } else if (info.type == SourceType::Annotations) {
-            AnnotationManager& annotationManager = map.getAnnotationManager();
-            new_tile.data = std::make_shared<LiveTileData>(normalized_id, annotationManager,
-                                                           map.getMaxZoom(), style, glyphAtlas,
+            new_tile.data = std::make_shared<LiveTileData>(normalized_id, data.annotationManager,
+                                                           data.transform.getMaxZoom(), style, glyphAtlas,
                                                            glyphStore, spriteAtlas, sprite, info);
-            new_tile.data->reparse(worker, callback);
+            new_tile.data->reparse(style.workers, callback);
         } else {
             throw std::runtime_error("source type not implemented");
         }
         tile_data.emplace(new_tile.data->id, new_tile.data);
     }
 
-    return new_tile.data->state;
+    return new_tile.data->getState();
 }
 
 double Source::getZoom(const TransformState& state) const {
@@ -318,7 +352,7 @@ bool Source::findLoadedChildren(const TileID& id, int32_t maxCoveringZoom, std::
     auto ids = id.children(z + 1);
     for (const auto& child_id : ids) {
         const TileData::State state = hasTile(child_id);
-        if (state == TileData::State::parsed) {
+        if (TileData::isReadyState(state)) {
             retain.emplace_front(child_id);
         } else {
             complete = false;
@@ -344,7 +378,7 @@ bool Source::findLoadedParent(const TileID& id, int32_t minCoveringZoom, std::fo
     for (int32_t z = id.z - 1; z >= minCoveringZoom; --z) {
         const TileID parent_id = id.parent(z);
         const TileData::State state = hasTile(parent_id);
-        if (state == TileData::State::parsed) {
+        if (TileData::isReadyState(state)) {
             retain.emplace_front(parent_id);
             return true;
         }
@@ -352,21 +386,23 @@ bool Source::findLoadedParent(const TileID& id, int32_t minCoveringZoom, std::fo
     return false;
 }
 
-void Source::update(Map &map,
-                    Worker &worker,
-                    util::ptr<Style> style,
-                    GlyphAtlas &glyphAtlas,
-                    GlyphStore &glyphStore,
-                    SpriteAtlas &spriteAtlas,
+bool Source::update(MapData& data,
+                    const TransformState& transformState,
+                    Style& style,
+                    GlyphAtlas& glyphAtlas,
+                    GlyphStore& glyphStore,
+                    SpriteAtlas& spriteAtlas,
                     util::ptr<Sprite> sprite,
-                    TexturePool &texturePool,
-                    std::function<void()> callback) {
-    if (!loaded || map.getTime() <= updated) {
-        return;
+                    TexturePool& texturePool,
+                    bool shouldReparsePartialTiles) {
+    bool allTilesUpdated = true;
+
+    if (!loaded || data.getAnimationTime() <= updated) {
+        return allTilesUpdated;
     }
 
-    int32_t zoom = std::floor(getZoom(map.getState()));
-    std::forward_list<TileID> required = coveringTiles(map.getState());
+    int32_t zoom = std::floor(getZoom(transformState));
+    std::forward_list<TileID> required = coveringTiles(transformState);
 
     // Determine the overzooming/underzooming amounts.
     int32_t minCoveringZoom = util::clamp<int32_t>(zoom - 10, info.min_zoom, info.max_zoom);
@@ -379,10 +415,25 @@ void Source::update(Map &map,
 
     // Add existing child/parent tiles if the actual tile is not yet loaded
     for (const auto& id : required) {
-        const TileData::State state = addTile(map, worker, style, glyphAtlas, glyphStore,
-                                              spriteAtlas, sprite, texturePool, id, callback);
+        TileData::State state = hasTile(id);
 
-        if (state != TileData::State::parsed) {
+        switch (state) {
+        case TileData::State::partial:
+            if (shouldReparsePartialTiles) {
+                if (!handlePartialTile(id, style.workers)) {
+                    allTilesUpdated = false;
+                }
+            }
+            break;
+        case TileData::State::invalid:
+            state = addTile(data, transformState, style, glyphAtlas, glyphStore,
+                            spriteAtlas, sprite, texturePool, id);
+            break;
+        default:
+            break;
+        }
+
+        if (!TileData::isReadyState(state)) {
             // The tile we require is not yet loaded. Try to find a parent or
             // child tile that we already have.
 
@@ -399,9 +450,9 @@ void Source::update(Map &map,
     }
 
     if (info.type != SourceType::Raster && cache.getSize() == 0) {
-        size_t conservativeCacheSize = ((float)map.getState().getWidth()  / util::tileSize) *
-                                       ((float)map.getState().getHeight() / util::tileSize) *
-                                       (map.getMaxZoom() - map.getMinZoom() + 1) *
+        size_t conservativeCacheSize = ((float)transformState.getWidth()  / util::tileSize) *
+                                       ((float)transformState.getHeight() / util::tileSize) *
+                                       (data.transform.getMaxZoom() - data.transform.getMinZoom() + 1) *
                                        0.5;
         cache.setSize(conservativeCacheSize);
     }
@@ -417,7 +468,10 @@ void Source::update(Map &map,
         bool obsolete = std::find(retain.begin(), retain.end(), tile.id) == retain.end();
         if (!obsolete) {
             retain_data.insert(tile.data->id);
-        } else if (type != SourceType::Raster && tile.data->ready()) {
+        } else if (type != SourceType::Raster && tile.data->getState() == TileData::State::parsed) {
+            // Partially parsed tiles are never added to the cache because otherwise
+            // they never get updated if the go out from the viewport and the pending
+            // resources arrive.
             tileCache.add(tile.id.normalized().to_uint64(), tile.data);
         }
         return obsolete;
@@ -441,7 +495,11 @@ void Source::update(Map &map,
         }
     });
 
-    updated = map.getTime();
+    updateTilePtrs();
+
+    updated = data.getAnimationTime();
+
+    return allTilesUpdated;
 }
 
 void Source::invalidateTiles(const std::vector<TileID>& ids) {
@@ -450,6 +508,14 @@ void Source::invalidateTiles(const std::vector<TileID>& ids) {
         tiles.erase(id);
         tile_data.erase(id);
     }
+    updateTilePtrs();
+}
+
+void Source::updateTilePtrs() {
+    tilePtrs.clear();
+    for (const auto& pair : tiles) {
+        tilePtrs.push_back(pair.second.get());
+    }
 }
 
 void Source::setCacheSize(size_t size) {
@@ -460,4 +526,20 @@ void Source::onLowMemory() {
     cache.clear();
 }
 
+void Source::setObserver(Observer* observer) {
+    observer_ = observer;
+}
+
+void Source::emitSourceLoaded() {
+    if (observer_) {
+        observer_->onSourceLoaded();
+    }
+}
+
+void Source::emitTileLoaded(bool isNewTile) {
+    if (observer_) {
+        observer_->onTileLoaded(isNewTile);
+    }
+}
+
 }
diff --git a/src/mbgl/map/source.hpp b/src/mbgl/map/source.hpp
index 035e86228..9d3de81b7 100644
--- a/src/mbgl/map/source.hpp
+++ b/src/mbgl/map/source.hpp
@@ -20,9 +20,8 @@
 
 namespace mbgl {
 
-class Map;
+class MapData;
 class Environment;
-class Worker;
 class GlyphAtlas;
 class GlyphStore;
 class SpriteAtlas;
@@ -30,7 +29,7 @@ class Sprite;
 class TexturePool;
 class Style;
 class Painter;
-class StyleLayer;
+class Request;
 class TransformState;
 class Tile;
 struct ClipID;
@@ -52,44 +51,77 @@ public:
     std::string tileURL(const TileID& id, float pixelRatio) const;
 };
 
-class Source : public std::enable_shared_from_this<Source>, private util::noncopyable {
+class Source : private util::noncopyable {
 public:
+    class Observer {
+    public:
+        virtual ~Observer() = default;
+
+        virtual void onSourceLoaded() = 0;
+        virtual void onTileLoaded(bool isNewTile) = 0;
+    };
+
     Source();
     ~Source();
 
-    void load(const std::string& accessToken,
-              Environment&,
-              std::function<void()> callback);
+    void load(const std::string& accessToken);
+    bool isLoaded() const;
 
-    void update(Map &, Worker &, util::ptr<Style>, GlyphAtlas &, GlyphStore &,
-                SpriteAtlas &, util::ptr<Sprite>, TexturePool &, std::function<void()> callback);
+    void load(MapData&, Environment&, std::function<void()> callback);
+
+    // Request or parse all the tiles relevant for the "TransformState". This method
+    // will return true if all the tiles were scheduled for updating of false if
+    // they were not. shouldReparsePartialTiles must be set to "true" if there is
+    // new data available that a tile in the "partial" state might be interested at.
+    bool update(MapData&,
+                const TransformState&,
+                Style&,
+                GlyphAtlas&,
+                GlyphStore&,
+                SpriteAtlas&,
+                util::ptr<Sprite>,
+                TexturePool&,
+                bool shouldReparsePartialTiles);
 
     void invalidateTiles(const std::vector<TileID>&);
 
     void updateMatrices(const mat4 &projMatrix, const TransformState &transform);
     void drawClippingMasks(Painter &painter);
-    void render(Painter &painter, const StyleLayer &layer_desc);
     void finishRender(Painter &painter);
 
     std::forward_list<Tile *> getLoadedTiles() const;
+    const std::vector<Tile*>& getTiles() const;
 
     void setCacheSize(size_t);
     void onLowMemory();
 
+    void setObserver(Observer* observer);
+
     SourceInfo info;
     bool enabled;
 
 private:
+    void emitSourceLoaded();
+    void emitTileLoaded(bool isNewTile);
+
+    bool handlePartialTile(const TileID &id, Worker &worker);
     bool findLoadedChildren(const TileID& id, int32_t maxCoveringZoom, std::forward_list<TileID>& retain);
     bool findLoadedParent(const TileID& id, int32_t minCoveringZoom, std::forward_list<TileID>& retain);
     int32_t coveringZoomLevel(const TransformState&) const;
     std::forward_list<TileID> coveringTiles(const TransformState&) const;
 
-    TileData::State addTile(Map &, Worker &, util::ptr<Style>, GlyphAtlas &,
-                            GlyphStore &, SpriteAtlas &, util::ptr<Sprite>, TexturePool &,
-                            const TileID &, std::function<void()> callback);
+    TileData::State addTile(MapData&,
+                            const TransformState&,
+                            Style&,
+                            GlyphAtlas&,
+                            GlyphStore&,
+                            SpriteAtlas&,
+                            util::ptr<Sprite>,
+                            TexturePool&,
+                            const TileID&);
 
     TileData::State hasTile(const TileID& id);
+    void updateTilePtrs();
 
     double getZoom(const TransformState &state) const;
 
@@ -99,8 +131,12 @@ private:
     TimePoint updated = TimePoint::min();
 
     std::map<TileID, std::unique_ptr<Tile>> tiles;
+    std::vector<Tile*> tilePtrs;
     std::map<TileID, std::weak_ptr<TileData>> tile_data;
     TileCache cache;
+
+    Request* req = nullptr;
+    Observer* observer_ = nullptr;
 };
 
 }
diff --git a/src/mbgl/map/sprite.cpp b/src/mbgl/map/sprite.cpp
index 8883ee092..cfc097457 100644
--- a/src/mbgl/map/sprite.cpp
+++ b/src/mbgl/map/sprite.cpp
@@ -1,5 +1,4 @@
 #include <mbgl/map/sprite.hpp>
-#include <mbgl/map/map.hpp>
 #include <mbgl/util/raster.hpp>
 #include <mbgl/platform/log.hpp>
 
@@ -24,77 +23,60 @@ SpritePosition::SpritePosition(uint16_t x_, uint16_t y_, uint16_t width_, uint16
       sdf(sdf_) {
 }
 
-util::ptr<Sprite> Sprite::Create(const std::string &base_url, float pixelRatio, Environment &env) {
-    util::ptr<Sprite> sprite(std::make_shared<Sprite>(Key(), base_url, pixelRatio));
-    sprite->load(env);
-    return sprite;
-}
-
-Sprite::Sprite(const Key &, const std::string& base_url, float pixelRatio_)
-    : valid(base_url.length() > 0),
-      pixelRatio(pixelRatio_ > 1 ? 2 : 1),
-      spriteURL(base_url + (pixelRatio_ > 1 ? "@2x" : "") + ".png"),
-      jsonURL(base_url + (pixelRatio_ > 1 ? "@2x" : "") + ".json"),
+Sprite::Sprite(const std::string& baseUrl, float pixelRatio_)
+    : pixelRatio(pixelRatio_ > 1 ? 2 : 1),
       raster(),
       loadedImage(false),
       loadedJSON(false),
-      future(promise.get_future()) {
-}
-
-bool Sprite::hasPixelRatio(float ratio) const {
-    return pixelRatio == (ratio > 1 ? 2 : 1);
-}
-
-
-void Sprite::waitUntilLoaded() const {
-    future.wait();
-}
-
-Sprite::operator bool() const {
-    return valid && isLoaded() && !pos.empty();
-}
-
-
-// Note: This is a separate function that must be called exactly once after creation
-// The reason this isn't part of the constructor is that calling shared_from_this() in
-// the constructor fails.
-void Sprite::load(Environment &env) {
-    if (!valid) {
+      env(Environment::Get()) {
+    if (baseUrl.empty()) {
         // Treat a non-existent sprite as a successfully loaded empty sprite.
         loadedImage = true;
         loadedJSON = true;
-        promise.set_value();
         return;
     }
 
-    util::ptr<Sprite> sprite = shared_from_this();
+    std::string spriteURL(baseUrl + (pixelRatio_ > 1 ? "@2x" : "") + ".png");
+    std::string jsonURL(baseUrl + (pixelRatio_ > 1 ? "@2x" : "") + ".json");
 
-    env.request({ Resource::Kind::JSON, jsonURL }, [sprite](const Response &res) {
+    jsonRequest = env.request({ Resource::Kind::JSON, jsonURL }, [this](const Response &res) {
+        jsonRequest = nullptr;
         if (res.status == Response::Successful) {
-            sprite->body = res.data;
-            sprite->parseJSON();
+            body = res.data;
+            parseJSON();
         } else {
             Log::Warning(Event::Sprite, "Failed to load sprite info: %s", res.message.c_str());
         }
-        sprite->loadedJSON = true;
-        sprite->complete();
+        loadedJSON = true;
+        emitSpriteLoadedIfComplete();
     });
 
-    env.request({ Resource::Kind::Image, spriteURL }, [sprite](const Response &res) {
+    spriteRequest = env.request({ Resource::Kind::Image, spriteURL }, [this](const Response &res) {
+        spriteRequest = nullptr;
         if (res.status == Response::Successful) {
-            sprite->image = res.data;
-            sprite->parseImage();
+            image = res.data;
+            parseImage();
         } else {
             Log::Warning(Event::Sprite, "Failed to load sprite image: %s", res.message.c_str());
         }
-        sprite->loadedImage = true;
-        sprite->complete();
+        loadedImage = true;
+        emitSpriteLoadedIfComplete();
     });
 }
 
-void Sprite::complete() {
-    if (loadedImage && loadedJSON) {
-        promise.set_value();
+Sprite::~Sprite() {
+    if (jsonRequest) {
+        env.cancelRequest(jsonRequest);
+    }
+
+    if (spriteRequest) {
+        env.cancelRequest(spriteRequest);
+    }
+}
+
+void Sprite::emitSpriteLoadedIfComplete() {
+    if (isLoaded() && observer) {
+        observer->onSpriteLoaded();
     }
 }
 
@@ -102,6 +84,10 @@ bool Sprite::isLoaded() const {
     return loadedImage && loadedJSON;
 }
 
+bool Sprite::hasPixelRatio(float ratio) const {
+    return pixelRatio == (ratio > 1 ? 2 : 1);
+}
+
 void Sprite::parseImage() {
     raster = util::make_unique<util::Image>(image);
     if (!*raster) {
@@ -149,3 +135,7 @@ const SpritePosition &Sprite::getSpritePosition(const std::string& name) const {
     auto it = pos.find(name);
     return it == pos.end() ? empty : it->second;
 }
+
+void Sprite::setObserver(Observer* observer_) {
+    observer = observer_;
+}
diff --git a/src/mbgl/map/sprite.hpp b/src/mbgl/map/sprite.hpp
index 6c1b3ba8e..ccf256161 100644
--- a/src/mbgl/map/sprite.hpp
+++ b/src/mbgl/map/sprite.hpp
@@ -4,17 +4,18 @@
 #include <mbgl/util/image.hpp>
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/ptr.hpp>
+#include <mbgl/storage/request.hpp>
 
 #include <cstdint>
 #include <atomic>
 #include <iosfwd>
 #include <string>
 #include <unordered_map>
-#include <future>
 
 namespace mbgl {
 
 class Environment;
+class Request;
 
 class SpritePosition {
 public:
@@ -31,40 +32,34 @@ public:
     bool sdf = false;
 };
 
-class Sprite : public std::enable_shared_from_this<Sprite>, private util::noncopyable {
-private:
-    struct Key {};
-    void load(Environment &env);
-
+class Sprite : private util::noncopyable {
 public:
-    Sprite(const Key &, const std::string& base_url, float pixelRatio);
-    static util::ptr<Sprite>
-    Create(const std::string &base_url, float pixelRatio, Environment &env);
+    class Observer {
+    public:
+        virtual ~Observer() = default;
+
+        virtual void onSpriteLoaded() = 0;
+    };
+
+    Sprite(const std::string& baseUrl, float pixelRatio);
+    ~Sprite();
 
     const SpritePosition &getSpritePosition(const std::string& name) const;
 
     bool hasPixelRatio(float ratio) const;
 
-    void waitUntilLoaded() const;
     bool isLoaded() const;
 
-    operator bool() const;
-
-private:
-    const bool valid;
-
-public:
     const float pixelRatio;
-    const std::string spriteURL;
-    const std::string jsonURL;
     std::unique_ptr<util::Image> raster;
 
+    void setObserver(Observer* observer);
 private:
+    void emitSpriteLoadedIfComplete();
+
     void parseJSON();
     void parseImage();
-    void complete();
 
-private:
     std::string body;
     std::string image;
     std::atomic<bool> loadedImage;
@@ -72,9 +67,10 @@ private:
     std::unordered_map<std::string, SpritePosition> pos;
     const SpritePosition empty;
 
-    std::promise<void> promise;
-    std::future<void> future;
-
+    Environment& env;
+    Request* jsonRequest = nullptr;
+    Request* spriteRequest = nullptr;
+    Observer* observer = nullptr;
 };
 
 }
diff --git a/src/mbgl/map/tile_cache.cpp b/src/mbgl/map/tile_cache.cpp
index 25aed6d15..37acf628a 100644
--- a/src/mbgl/map/tile_cache.cpp
+++ b/src/mbgl/map/tile_cache.cpp
@@ -46,7 +46,7 @@ std::shared_ptr<TileData> TileCache::get(uint64_t key) {
         data = it->second;
         tiles.erase(it);
         orderedKeys.remove(key);
-        assert(data->ready());
+        assert(data->isReady());
     }
 
     return data;
diff --git a/src/mbgl/map/tile_data.cpp b/src/mbgl/map/tile_data.cpp
index bb8d18d12..e9084bdff 100644
--- a/src/mbgl/map/tile_data.cpp
+++ b/src/mbgl/map/tile_data.cpp
@@ -4,6 +4,7 @@
 
 #include <mbgl/storage/file_source.hpp>
 #include <mbgl/util/worker.hpp>
+#include <mbgl/util/work_request.hpp>
 #include <mbgl/platform/log.hpp>
 
 using namespace mbgl;
@@ -11,9 +12,9 @@ using namespace mbgl;
 TileData::TileData(const TileID& id_, const SourceInfo& source_)
     : id(id_),
       name(id),
-      state(State::initial),
       source(source_),
       env(Environment::Get()),
+      state(State::initial),
       debugBucket(debugFontBuffer) {
     // Initialize tile debug coordinates
     debugFontBuffer.addText(name.c_str(), 50, 200, 5);
@@ -27,6 +28,12 @@ const std::string TileData::toString() const {
     return std::string { "[tile " } + name + "]";
 }
 
+void TileData::setState(const State& state_) {
+    assert(!isImmutable());
+
+    state = state_;
+}
+
 void TileData::request(Worker& worker, float pixelRatio, std::function<void()> callback) {
     std::string url = source.tileURL(id, pixelRatio);
     state = State::loading;
@@ -55,18 +62,22 @@ void TileData::cancel() {
         env.cancelRequest(req);
         req = nullptr;
     }
+    workRequest.reset();
 }
 
-void TileData::reparse(Worker& worker, std::function<void()> callback) {
-    util::ptr<TileData> tile = shared_from_this();
-    worker.send(
-        [tile]() {
-            EnvironmentScope scope(tile->env, ThreadType::TileWorker, "TileWorker_" + tile->name);
-            tile->parse();
-        },
-        [tile, callback]() {
-             // `tile` is bound in this lambda to ensure that if it's the last owning pointer,
-             // destruction happens on the map thread, not the worker thread.
-            callback();
-        });
+bool TileData::mayStartParsing() {
+    return !parsing.test_and_set(std::memory_order_acquire);
+}
+
+void TileData::endParsing() {
+    parsing.clear(std::memory_order_release);
+}
+
+bool TileData::reparse(Worker& worker, std::function<void()> callback) {
+    if (!mayStartParsing()) {
+        return false;
+    }
+
+    workRequest = worker.send([this] { parse(); endParsing(); }, callback);
+    return true;
 }
diff --git a/src/mbgl/map/tile_data.hpp b/src/mbgl/map/tile_data.hpp
index 92d9778fd..3945a3214 100644
--- a/src/mbgl/map/tile_data.hpp
+++ b/src/mbgl/map/tile_data.hpp
@@ -20,47 +20,90 @@ class SourceInfo;
 class StyleLayer;
 class Request;
 class Worker;
+class WorkRequest;
 
-class TileData : public std::enable_shared_from_this<TileData>,
-             private util::noncopyable {
+class TileData : private util::noncopyable {
 public:
     enum class State {
         invalid,
         initial,
         loading,
         loaded,
+        partial,
         parsed,
         obsolete
     };
 
+    // Tile data considered "Ready" can be used for rendering. Data in
+    // partial state is still waiting for network resources but can also
+    // be rendered, although layers will be missing.
+    inline static bool isReadyState(const State& state) {
+        return state == State::partial || state == State::parsed;
+    }
+
     TileData(const TileID&, const SourceInfo&);
     ~TileData();
 
     void request(Worker&, float pixelRatio, std::function<void ()> callback);
-    void reparse(Worker&, std::function<void ()> callback);
+
+    // Schedule a tile reparse on a worker thread and call the callback on
+    // completion. It will return true if the work was schedule or false it was
+    // not, which can occur if the tile is already being parsed by another
+    // worker (see "mayStartParsing()").
+    bool reparse(Worker&, std::function<void ()> callback);
+
     void cancel();
     const std::string toString() const;
 
-    inline bool ready() const {
-        return state == State::parsed;
+    inline bool isReady() const {
+        return isReadyState(state);
     }
 
+    // Returns true if the TileData is in a final state and we cannot
+    // make changes to it anymore.
+    inline bool isImmutable() const {
+        return state == State::parsed || state == State::obsolete;
+    }
+
+    // We let subclasses override setState() so they
+    // can intercept the state change and react accordingly.
+    virtual void setState(const State& state);
+
+    inline State getState() const {
+        return state;
+    }
+
+    void endParsing();
+
     // Override this in the child class.
     virtual void parse() = 0;
-    virtual void render(Painter &painter, const StyleLayer &layer_desc, const mat4 &matrix) = 0;
-    virtual bool hasData(StyleLayer const &layer_desc) const = 0;
+    virtual Bucket* getBucket(StyleLayer const &layer_desc) = 0;
 
     const TileID id;
     const std::string name;
-    std::atomic<State> state;
+    std::atomic_flag parsing = ATOMIC_FLAG_INIT;
 
 protected:
+    // Set the internal parsing state to true so we prevent
+    // multiple workers to parse the same tile in parallel,
+    // which can happen if the tile is in the "partial" state.
+    // It will return true if is possible to start pasing the
+    // tile or false if not (so some other worker is already
+    // parsing the tile).
+    bool mayStartParsing();
+
     const SourceInfo& source;
     Environment& env;
 
     Request *req = nullptr;
     std::string data;
 
+    std::unique_ptr<WorkRequest> workRequest;
+
+private:
+    std::atomic<State> state;
+
+protected:
     // Contains the tile ID string for painting debug information.
     DebugFontBuffer debugFontBuffer;
 
diff --git a/src/mbgl/map/tile_parser.cpp b/src/mbgl/map/tile_parser.cpp
index 2f82ec7de..a93245313 100644
--- a/src/mbgl/map/tile_parser.cpp
+++ b/src/mbgl/map/tile_parser.cpp
@@ -1,23 +1,15 @@
 #include <mbgl/map/tile_parser.hpp>
 #include <mbgl/map/vector_tile_data.hpp>
 #include <mbgl/platform/log.hpp>
-#include <mbgl/style/style.hpp>
 #include <mbgl/style/style_layer.hpp>
 #include <mbgl/map/source.hpp>
+#include <mbgl/map/sprite.hpp>
 #include <mbgl/renderer/fill_bucket.hpp>
 #include <mbgl/renderer/line_bucket.hpp>
 #include <mbgl/renderer/symbol_bucket.hpp>
-#include <mbgl/renderer/raster_bucket.hpp>
-#include <mbgl/util/raster.hpp>
 #include <mbgl/util/constants.hpp>
-#include <mbgl/util/token.hpp>
-#include <mbgl/geometry/glyph_atlas.hpp>
-#include <mbgl/text/glyph_store.hpp>
-#include <mbgl/text/collision_tile.hpp>
-#include <mbgl/text/glyph.hpp>
-#include <mbgl/map/map.hpp>
 #include <mbgl/util/std.hpp>
-#include <mbgl/util/utf.hpp>
+#include <mbgl/style/style.hpp>
 
 #include <locale>
 
@@ -30,7 +22,7 @@ TileParser::~TileParser() = default;
 
 TileParser::TileParser(const GeometryTile& geometryTile_,
                        VectorTileData& tile_,
-                       const util::ptr<const Style>& style_,
+                       const Style& style_,
                        GlyphAtlas& glyphAtlas_,
                        GlyphStore& glyphStore_,
                        SpriteAtlas& spriteAtlas_,
@@ -42,16 +34,16 @@ TileParser::TileParser(const GeometryTile& geometryTile_,
       glyphStore(glyphStore_),
       spriteAtlas(spriteAtlas_),
       sprite(sprite_),
-      collision(util::make_unique<CollisionTile>(tile.id.z, 4096, tile.source.tile_size)) {
-    assert(style);
+      partialParse(false) {
     assert(sprite);
-    assert(collision);
 }
 
-bool TileParser::obsolete() const { return tile.state == TileData::State::obsolete; }
+bool TileParser::obsolete() const {
+    return tile.getState() == TileData::State::obsolete;
+}
 
 void TileParser::parse() {
-    for (const auto& layer_desc : style->layers) {
+    for (const auto& layer_desc : style.layers) {
         // Cancel early when parsing.
         if (obsolete()) {
             return;
@@ -65,15 +57,15 @@ void TileParser::parse() {
         if (layer_desc->bucket) {
             // This is a singular layer. Check if this bucket already exists. If not,
             // parse this bucket.
-            auto bucket_it = tile.buckets.find(layer_desc->bucket->name);
-            if (bucket_it == tile.buckets.end()) {
-                // We need to create this bucket since it doesn't exist yet.
-                std::unique_ptr<Bucket> bucket = createBucket(*layer_desc->bucket);
-                if (bucket) {
-                    // Bucket creation might fail because the data tile may not
-                    // contain any data that falls into this bucket.
-                    tile.buckets[layer_desc->bucket->name] = std::move(bucket);
-                }
+            if (tile.getBucket(*layer_desc)) {
+                continue;
+            }
+
+            std::unique_ptr<Bucket> bucket = createBucket(*layer_desc->bucket);
+            if (bucket) {
+                // Bucket creation might fail because the data tile may not
+                // contain any data that falls into this bucket.
+                tile.setBucket(*layer_desc, std::move(bucket));
             }
         } else {
             Log::Warning(Event::ParseTile, "layer '%s' does not have buckets", layer_desc->id.c_str());
@@ -166,7 +158,7 @@ std::unique_ptr<Bucket> TileParser::createFillBucket(const GeometryTileLayer& la
                                                 tile.triangleElementsBuffer,
                                                 tile.lineElementsBuffer);
     addBucketGeometries(bucket, layer, bucket_desc.filter);
-    return std::move(bucket);
+    return bucket->hasData() ? std::move(bucket) : nullptr;
 }
 
 std::unique_ptr<Bucket> TileParser::createLineBucket(const GeometryTileLayer& layer,
@@ -183,12 +175,12 @@ std::unique_ptr<Bucket> TileParser::createLineBucket(const GeometryTileLayer& la
     applyLayoutProperty(PropertyKey::LineRoundLimit, bucket_desc.layout, layout.round_limit, z);
 
     addBucketGeometries(bucket, layer, bucket_desc.filter);
-    return std::move(bucket);
+    return bucket->hasData() ? std::move(bucket) : nullptr;
 }
 
 std::unique_ptr<Bucket> TileParser::createSymbolBucket(const GeometryTileLayer& layer,
                                                        const StyleBucket& bucket_desc) {
-    auto bucket = util::make_unique<SymbolBucket>(*collision);
+    auto bucket = util::make_unique<SymbolBucket>(*tile.getCollision());
 
     const float z = tile.id.z;
     auto& layout = bucket->layout;
@@ -231,8 +223,22 @@ std::unique_ptr<Bucket> TileParser::createSymbolBucket(const GeometryTileLayer&
     applyLayoutProperty(PropertyKey::TextOffset, bucket_desc.layout, layout.text.offset, z);
     applyLayoutProperty(PropertyKey::TextAllowOverlap, bucket_desc.layout, layout.text.allow_overlap, z);
 
+    if (bucket->needsDependencies(layer, bucket_desc.filter, glyphStore, *sprite)) {
+        partialParse = true;
+    }
+
+    // We do not proceed if the parser is in a "partial" state because
+    // the layer ordering needs to be respected when calculating text
+    // collisions. Although, at this point, we requested all the resources
+    // needed by this tile.
+    if (partialParse) {
+        return nullptr;
+    }
+
     bucket->addFeatures(
-        layer, bucket_desc.filter, reinterpret_cast<uintptr_t>(&tile), spriteAtlas, *sprite, glyphAtlas, glyphStore);
-    return std::move(bucket);
+        reinterpret_cast<uintptr_t>(&tile), spriteAtlas, *sprite, glyphAtlas, glyphStore);
+
+    return bucket->hasData() ? std::move(bucket) : nullptr;
 }
+
 }
diff --git a/src/mbgl/map/tile_parser.hpp b/src/mbgl/map/tile_parser.hpp
index 5f278dade..88e568780 100644
--- a/src/mbgl/map/tile_parser.hpp
+++ b/src/mbgl/map/tile_parser.hpp
@@ -29,13 +29,12 @@ class StyleLayoutRaster;
 class StyleLayoutLine;
 class StyleLayoutSymbol;
 class VectorTileData;
-class CollisionTile;
 
 class TileParser : private util::noncopyable {
 public:
     TileParser(const GeometryTile& geometryTile,
                VectorTileData& tile,
-               const util::ptr<const Style>& style,
+               const Style& style,
                GlyphAtlas& glyphAtlas,
                GlyphStore& glyphStore,
                SpriteAtlas& spriteAtlas,
@@ -44,6 +43,9 @@ public:
 
 public:
     void parse();
+    inline bool isPartialParse() const {
+        return partialParse;
+    }
 
 private:
     bool obsolete() const;
@@ -60,13 +62,13 @@ private:
     VectorTileData& tile;
 
     // Cross-thread shared data.
-    util::ptr<const Style> style;
+    const Style& style;
     GlyphAtlas& glyphAtlas;
     GlyphStore& glyphStore;
     SpriteAtlas& spriteAtlas;
     util::ptr<Sprite> sprite;
 
-    std::unique_ptr<CollisionTile> collision;
+    bool partialParse;
 };
 
 }
diff --git a/src/mbgl/map/transform.cpp b/src/mbgl/map/transform.cpp
index cb73915e3..32127fb26 100644
--- a/src/mbgl/map/transform.cpp
+++ b/src/mbgl/map/transform.cpp
@@ -23,7 +23,7 @@ static double _normalizeAngle(double angle, double anchorAngle)
     if (std::abs(angle + util::M2PI - anchorAngle) < diff) {
         angle += util::M2PI;
     }
-    
+
     return angle;
 }
 
@@ -61,6 +61,10 @@ bool Transform::resize(const uint16_t w, const uint16_t h, const float ratio,
 #pragma mark - Position
 
 void Transform::moveBy(const double dx, const double dy, const Duration duration) {
+    if (std::isnan(dx) || std::isnan(dy)) {
+        return;
+    }
+
     std::lock_guard<std::recursive_mutex> lock(mtx);
 
     _moveBy(dx, dy, duration);
@@ -104,6 +108,10 @@ void Transform::_moveBy(const double dx, const double dy, const Duration duratio
 }
 
 void Transform::setLatLng(const LatLng latLng, const Duration duration) {
+    if (std::isnan(latLng.latitude) || std::isnan(latLng.longitude)) {
+        return;
+    }
+
     std::lock_guard<std::recursive_mutex> lock(mtx);
 
     const double m = 1 - 1e-15;
@@ -116,6 +124,10 @@ void Transform::setLatLng(const LatLng latLng, const Duration duration) {
 }
 
 void Transform::setLatLngZoom(const LatLng latLng, const double zoom, const Duration duration) {
+    if (std::isnan(latLng.latitude) || std::isnan(latLng.longitude) || std::isnan(zoom)) {
+        return;
+    }
+
     std::lock_guard<std::recursive_mutex> lock(mtx);
 
     double new_scale = std::pow(2.0, zoom);
@@ -137,6 +149,10 @@ void Transform::setLatLngZoom(const LatLng latLng, const double zoom, const Dura
 #pragma mark - Zoom
 
 void Transform::scaleBy(const double ds, const double cx, const double cy, const Duration duration) {
+    if (std::isnan(ds) || std::isnan(cx) || std::isnan(cy)) {
+        return;
+    }
+
     std::lock_guard<std::recursive_mutex> lock(mtx);
 
     // clamp scale to min/max values
@@ -152,12 +168,20 @@ void Transform::scaleBy(const double ds, const double cx, const double cy, const
 
 void Transform::setScale(const double scale, const double cx, const double cy,
                          const Duration duration) {
+    if (std::isnan(scale) || std::isnan(cx) || std::isnan(cy)) {
+        return;
+    }
+
     std::lock_guard<std::recursive_mutex> lock(mtx);
 
     _setScale(scale, cx, cy, duration);
 }
 
 void Transform::setZoom(const double zoom, const Duration duration) {
+    if (std::isnan(zoom)) {
+        return;
+    }
+
     std::lock_guard<std::recursive_mutex> lock(mtx);
 
     _setScale(std::pow(2.0, zoom), -1, -1, duration);
@@ -199,14 +223,14 @@ void Transform::_setScale(double new_scale, double cx, double cy, const Duration
 
     // Zoom in on the center if we don't have click or gesture anchor coordinates.
     if (cx < 0 || cy < 0) {
-        cx = current.width / 2;
-        cy = current.height / 2;
+        cx = static_cast<double>(current.width) / 2.0;
+        cy = static_cast<double>(current.height) / 2.0;
     }
 
     // Account for the x/y offset from the center (= where the user clicked or pinched)
     const double factor = new_scale / current.scale;
-    const double dx = (cx - current.width / 2) * (1.0 - factor);
-    const double dy = (cy - current.height / 2) * (1.0 - factor);
+    const double dx = (cx - static_cast<double>(current.width) / 2.0) * (1.0 - factor);
+    const double dy = (cy - static_cast<double>(current.height) / 2.0) * (1.0 - factor);
 
     // Account for angle
     const double angle_sin = std::sin(-current.angle);
@@ -238,6 +262,9 @@ void Transform::_setScaleXY(const double new_scale, const double xn, const doubl
         current.scale = final.scale;
         current.x = final.x;
         current.y = final.y;
+        const double s = current.scale * util::tileSize;
+        current.Bc = s / 360;
+        current.Cc = s / util::M2PI;
     } else {
         const double startS = current.scale;
         const double startX = current.x;
@@ -250,6 +277,9 @@ void Transform::_setScaleXY(const double new_scale, const double xn, const doubl
                 current.scale = util::interpolate(startS, final.scale, t);
                 current.x = util::interpolate(startX, final.x, t);
                 current.y = util::interpolate(startY, final.y, t);
+                const double s = current.scale * util::tileSize;
+                current.Bc = s / 360;
+                current.Cc = s / util::M2PI;
                 return Update::Zoom;
             },
             [=] {
@@ -258,10 +288,6 @@ void Transform::_setScaleXY(const double new_scale, const double xn, const doubl
             }, duration);
     }
 
-    const double s = final.scale * util::tileSize;
-    current.Bc = s / 360;
-    current.Cc = s / util::M2PI;
-
     view.notifyMapChange(duration != Duration::zero() ?
                            MapChangeRegionDidChangeAnimated :
                            MapChangeRegionDidChange,
@@ -285,9 +311,13 @@ void Transform::constrain(double& scale, double& y) const {
 
 void Transform::rotateBy(const double start_x, const double start_y, const double end_x,
                          const double end_y, const Duration duration) {
+    if (std::isnan(start_x) || std::isnan(start_y) || std::isnan(end_x) || std::isnan(end_y)) {
+        return;
+    }
+
     std::lock_guard<std::recursive_mutex> lock(mtx);
 
-    double center_x = current.width / 2, center_y = current.height / 2;
+    double center_x = static_cast<double>(current.width) / 2.0, center_y = static_cast<double>(current.height) / 2.0;
 
     const double begin_center_x = start_x - center_x;
     const double begin_center_y = start_y - center_y;
@@ -315,19 +345,27 @@ void Transform::rotateBy(const double start_x, const double start_y, const doubl
 }
 
 void Transform::setAngle(const double new_angle, const Duration duration) {
+    if (std::isnan(new_angle)) {
+        return;
+    }
+
     std::lock_guard<std::recursive_mutex> lock(mtx);
 
     _setAngle(new_angle, duration);
 }
 
 void Transform::setAngle(const double new_angle, const double cx, const double cy) {
+    if (std::isnan(new_angle) || std::isnan(cx) || std::isnan(cy)) {
+        return;
+    }
+
     std::lock_guard<std::recursive_mutex> lock(mtx);
 
     double dx = 0, dy = 0;
 
     if (cx >= 0 && cy >= 0) {
-        dx = (final.width / 2) - cx;
-        dy = (final.height / 2) - cy;
+        dx = (static_cast<double>(final.width) / 2.0) - cx;
+        dy = (static_cast<double>(final.height) / 2.0) - cy;
         _moveBy(dx, dy, Duration::zero());
     }
 
diff --git a/include/mbgl/map/transform.hpp b/src/mbgl/map/transform.hpp
similarity index 100%
rename from include/mbgl/map/transform.hpp
rename to src/mbgl/map/transform.hpp
diff --git a/src/mbgl/map/transform_state.cpp b/src/mbgl/map/transform_state.cpp
index 507e63f67..2a1cc4b9e 100644
--- a/src/mbgl/map/transform_state.cpp
+++ b/src/mbgl/map/transform_state.cpp
@@ -31,8 +31,8 @@ box TransformState::cornersToBox(uint32_t z) const {
     const double angle_sin = std::sin(-angle);
     const double angle_cos = std::cos(-angle);
 
-    const double w_2 = width / 2;
-    const double h_2 = height / 2;
+    const double w_2 = static_cast<double>(width) / 2.0;
+    const double h_2 = static_cast<double>(height) / 2.0;
     const double ss_0 = scale * util::tileSize;
     const double ss_1 = ref_scale / ss_0;
     const double ss_2 = ss_0 / 2.0;
@@ -166,8 +166,8 @@ const vec2<double> TransformState::pixelForLatLng(const LatLng latLng) const {
     LatLng ll = getLatLng();
     double zoom = getZoom();
 
-    const double centerX = width  / 2;
-    const double centerY = height / 2;
+    const double centerX = static_cast<double>(width) / 2.0;
+    const double centerY = static_cast<double>(height) / 2.0;
 
     const double m = Projection::getMetersPerPixelAtLatitude(0, zoom);
 
diff --git a/include/mbgl/map/transform_state.hpp b/src/mbgl/map/transform_state.hpp
similarity index 93%
rename from include/mbgl/map/transform_state.hpp
rename to src/mbgl/map/transform_state.hpp
index f6a00a4a3..e09be8ca6 100644
--- a/include/mbgl/map/transform_state.hpp
+++ b/src/mbgl/map/transform_state.hpp
@@ -3,6 +3,7 @@
 
 #include <mbgl/util/mat4.hpp>
 #include <mbgl/util/geo.hpp>
+#include <mbgl/util/constants.hpp>
 #include <mbgl/util/vec.hpp>
 
 #include <cstdint>
@@ -71,9 +72,6 @@ private:
     // map scale factor
     float pixelRatio = 0;
 
-    // cache values for spherical mercator math
-    double Bc, Cc;
-
     // animation state
     bool rotating = false;
     bool scaling = false;
@@ -84,6 +82,10 @@ private:
     double x = 0, y = 0;
     double angle = 0;
     double scale = 1;
+
+    // cache values for spherical mercator math
+    double Bc = (scale * util::tileSize) / 360;
+    double Cc = (scale * util::tileSize) / util::M2PI;
 };
 
 }
diff --git a/src/mbgl/map/vector_tile_data.cpp b/src/mbgl/map/vector_tile_data.cpp
index 39c2d9fce..f040422e4 100644
--- a/src/mbgl/map/vector_tile_data.cpp
+++ b/src/mbgl/map/vector_tile_data.cpp
@@ -6,80 +6,104 @@
 #include <mbgl/map/source.hpp>
 #include <mbgl/geometry/glyph_atlas.hpp>
 #include <mbgl/platform/log.hpp>
+#include <mbgl/text/collision_tile.hpp>
 #include <mbgl/util/pbf.hpp>
 
 using namespace mbgl;
 
 VectorTileData::VectorTileData(const TileID& id_,
                                float mapMaxZoom,
-                               util::ptr<Style> style_,
+                               Style& style_,
                                GlyphAtlas& glyphAtlas_,
                                GlyphStore& glyphStore_,
                                SpriteAtlas& spriteAtlas_,
                                util::ptr<Sprite> sprite_,
                                const SourceInfo& source_)
     : TileData(id_, source_),
+      depth(id_.z >= source_.max_zoom ? mapMaxZoom - id_.z : 1),
       glyphAtlas(glyphAtlas_),
       glyphStore(glyphStore_),
       spriteAtlas(spriteAtlas_),
       sprite(sprite_),
       style(style_),
-      depth(id.z >= source.max_zoom ? mapMaxZoom - id.z : 1) {
+      collision(util::make_unique<CollisionTile>(id_.z, 4096, source_.tile_size)) {
 }
 
 VectorTileData::~VectorTileData() {
+    // Cancel in most derived class destructor so that worker tasks are joined before
+    // any member data goes away.
+    cancel();
     glyphAtlas.removeGlyphs(reinterpret_cast<uintptr_t>(this));
 }
 
 void VectorTileData::parse() {
-    if (state != State::loaded) {
+    if (getState() != State::loaded && getState() != State::partial) {
         return;
     }
 
     try {
-        if (!style) {
-            throw std::runtime_error("style isn't present in VectorTileData object anymore");
-        }
-
         // Parsing creates state that is encapsulated in TileParser. While parsing,
         // the TileParser object writes results into this objects. All other state
         // is going to be discarded afterwards.
         VectorTile vectorTile(pbf((const uint8_t *)data.data(), data.size()));
         const VectorTile* vt = &vectorTile;
         TileParser parser(*vt, *this, style, glyphAtlas, glyphStore, spriteAtlas, sprite);
-
-        // Clear the style so that we don't have a cycle in the shared_ptr references.
-        style.reset();
-
         parser.parse();
+
+        if (getState() == State::obsolete) {
+            return;
+        }
+
+        if (parser.isPartialParse()) {
+            setState(State::partial);
+        } else {
+            setState(State::parsed);
+        }
     } catch (const std::exception& ex) {
         Log::Error(Event::ParseTile, "Parsing [%d/%d/%d] failed: %s", id.z, id.x, id.y, ex.what());
-        state = State::obsolete;
+        setState(State::obsolete);
+        return;
+    }
+}
+
+Bucket* VectorTileData::getBucket(StyleLayer const& layer) {
+    if (!isReady() || !layer.bucket) {
+        return nullptr;
+    }
+
+    std::lock_guard<std::mutex> lock(bucketsMutex);
+
+    const auto it = buckets.find(layer.bucket->name);
+    if (it == buckets.end()) {
+        return nullptr;
+    }
+
+    assert(it->second);
+    return it->second.get();
+}
+
+size_t VectorTileData::countBuckets() const {
+    std::lock_guard<std::mutex> lock(bucketsMutex);
+
+    return buckets.size();
+}
+
+void VectorTileData::setBucket(StyleLayer const& layer, std::unique_ptr<Bucket> bucket) {
+    assert(layer.bucket);
+
+    std::lock_guard<std::mutex> lock(bucketsMutex);
+
+    if (buckets.find(layer.bucket->name) != buckets.end()) {
         return;
     }
 
-    if (state != State::obsolete) {
-        state = State::parsed;
-    }
+    buckets[layer.bucket->name] = std::move(bucket);
 }
 
-void VectorTileData::render(Painter &painter, const StyleLayer &layer_desc, const mat4 &matrix) {
-    if (state == State::parsed && layer_desc.bucket) {
-        auto databucket_it = buckets.find(layer_desc.bucket->name);
-        if (databucket_it != buckets.end()) {
-            assert(databucket_it->second);
-            databucket_it->second->render(painter, layer_desc, id, matrix);
-        }
-    }
-}
+void VectorTileData::setState(const State& state_) {
+    TileData::setState(state_);
 
-bool VectorTileData::hasData(const StyleLayer &layer_desc) const {
-    if (state == State::parsed && layer_desc.bucket) {
-        auto databucket_it = buckets.find(layer_desc.bucket->name);
-        if (databucket_it != buckets.end()) {
-            assert(databucket_it->second);
-            return databucket_it->second->hasData();
-        }
+    if (isImmutable()) {
+        collision.reset();
     }
-    return false;
 }
diff --git a/src/mbgl/map/vector_tile_data.hpp b/src/mbgl/map/vector_tile_data.hpp
index fc32b2aea..09a6330ed 100644
--- a/src/mbgl/map/vector_tile_data.hpp
+++ b/src/mbgl/map/vector_tile_data.hpp
@@ -11,11 +11,13 @@
 
 #include <iosfwd>
 #include <memory>
+#include <mutex>
 #include <unordered_map>
 
 namespace mbgl {
 
 class Bucket;
+class CollisionTile;
 class Painter;
 class SourceInfo;
 class StyleLayer;
@@ -32,7 +34,7 @@ class VectorTileData : public TileData {
 public:
     VectorTileData(const TileID&,
                    float mapMaxZoom,
-                   util::ptr<Style>,
+                   Style&,
                    GlyphAtlas&,
                    GlyphStore&,
                    SpriteAtlas&,
@@ -41,8 +43,18 @@ public:
     ~VectorTileData();
 
     void parse() override;
-    void render(Painter &painter, const StyleLayer &layer_desc, const mat4 &matrix) override;
-    bool hasData(StyleLayer const& layer_desc) const override;
+    virtual Bucket* getBucket(StyleLayer const &layer_desc) override;
+
+    size_t countBuckets() const;
+    void setBucket(StyleLayer const &layer_desc, std::unique_ptr<Bucket> bucket);
+
+    void setState(const State& state) override;
+
+    inline CollisionTile* getCollision() const {
+        return collision.get();
+    }
+
+    const float depth;
 
 protected:
     // Holds the actual geometries in this tile.
@@ -52,18 +64,23 @@ protected:
     TriangleElementsBuffer triangleElementsBuffer;
     LineElementsBuffer lineElementsBuffer;
 
-    // Holds the buckets of this tile.
-    // They contain the location offsets in the buffers stored above
-    std::unordered_map<std::string, std::unique_ptr<Bucket>> buckets;
-
     GlyphAtlas& glyphAtlas;
     GlyphStore& glyphStore;
     SpriteAtlas& spriteAtlas;
     util::ptr<Sprite> sprite;
-    util::ptr<Style> style;
+    Style& style;
 
-public:
-    const float depth;
+private:
+    // Contains all the Bucket objects for the tile. Buckets are render
+    // objects and they get added to this std::map<> by the workers doing
+    // the actual tile parsing as they get processed. Tiles partially
+    // parsed can get new buckets at any moment but are also fit for
+    // rendering. That said, access to this list needs locking unless
+    // the tile is completely parsed.
+    std::unordered_map<std::string, std::unique_ptr<Bucket>> buckets;
+    mutable std::mutex bucketsMutex;
+
+    std::unique_ptr<CollisionTile> collision;
 };
 
 }
diff --git a/src/mbgl/map/view.cpp b/src/mbgl/map/view.cpp
index fddcf3acd..fb771a8c4 100644
--- a/src/mbgl/map/view.cpp
+++ b/src/mbgl/map/view.cpp
@@ -2,6 +2,8 @@
 #include <mbgl/map/map.hpp>
 #include <mbgl/map/still_image.hpp>
 
+#include <cassert>
+
 namespace mbgl {
 
 void View::initialize(Map *map_) {
@@ -9,7 +11,7 @@ void View::initialize(Map *map_) {
     map = map_;
 }
 
-void View::discard() {
+void View::resize(uint16_t, uint16_t, float) {
     // no-op
 }
 
@@ -17,11 +19,6 @@ std::unique_ptr<StillImage> View::readStillImage() {
     return nullptr;
 }
 
-void View::resize(uint16_t width, uint16_t height, float ratio, uint16_t fbWidth, uint16_t fbHeight) {
-    assert(map);
-    map->resize(width, height, ratio, fbWidth, fbHeight);
-}
-
 void View::notifyMapChange(MapChange, Duration) {
     // no-op
 }
diff --git a/src/mbgl/platform/gl.cpp b/src/mbgl/platform/gl.cpp
index b18ca3da2..76be580b9 100644
--- a/src/mbgl/platform/gl.cpp
+++ b/src/mbgl/platform/gl.cpp
@@ -1,78 +1,36 @@
 #include <mbgl/platform/gl.hpp>
-#include <mbgl/platform/log.hpp>
-
-#include <iostream>
 
+#include <mutex>
 
 namespace mbgl {
 namespace gl {
 
-PFNGLDEBUGMESSAGECONTROLPROC DebugMessageControl = nullptr;
-PFNGLDEBUGMESSAGEINSERTPROC DebugMessageInsert = nullptr;
-PFNGLDEBUGMESSAGECALLBACKPROC DebugMessageCallback = nullptr;
-PFNGLGETDEBUGMESSAGELOGPROC GetDebugMessageLog = nullptr;
-PFNGLGETPOINTERVPROC GetPointerv = nullptr;
-PFNGLPUSHDEBUGGROUPPROC PushDebugGroup = nullptr;
-PFNGLPOPDEBUGGROUPPROC PopDebugGroup = nullptr;
-PFNGLOBJECTLABELPROC ObjectLabel = nullptr;
-PFNGLGETOBJECTLABELPROC GetObjectLabel = nullptr;
-PFNGLOBJECTPTRLABELPROC ObjectPtrLabel = nullptr;
-PFNGLGETOBJECTPTRLABELPROC GetObjectPtrLabel = nullptr;
-
-void debug_callback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei, const GLchar *message, const void *) {
-    std::string strSource;
-    switch (source) {
-        case GL_DEBUG_SOURCE_API: strSource = "DEBUG_SOURCE_API"; break;
-        case GL_DEBUG_SOURCE_WINDOW_SYSTEM: strSource = "DEBUG_SOURCE_WINDOW_SYSTEM"; break;
-        case GL_DEBUG_SOURCE_SHADER_COMPILER: strSource = "DEBUG_SOURCE_SHADER_COMPILER"; break;
-        case GL_DEBUG_SOURCE_THIRD_PARTY: strSource = "DEBUG_SOURCE_THIRD_PARTY"; break;
-        case GL_DEBUG_SOURCE_APPLICATION: strSource = "DEBUG_SOURCE_APPLICATION"; break;
-        case GL_DEBUG_SOURCE_OTHER: strSource = "DEBUG_SOURCE_OTHER"; break;
-        default: strSource = "(unknown)"; break;
-    }
-
-    std::string strType;
-    switch (type) {
-        case GL_DEBUG_TYPE_ERROR: strType = "DEBUG_TYPE_ERROR"; break;
-        case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR: strType = "DEBUG_TYPE_DEPRECATED_BEHAVIOR"; break;
-        case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR: strType = "DEBUG_TYPE_UNDEFINED_BEHAVIOR"; break;
-        case GL_DEBUG_TYPE_PERFORMANCE: strType = "DEBUG_TYPE_PERFORMANCE"; break;
-        case GL_DEBUG_TYPE_PORTABILITY: strType = "DEBUG_TYPE_PORTABILITY"; break;
-        case GL_DEBUG_TYPE_OTHER: strType = "DEBUG_TYPE_OTHER"; break;
-        case GL_DEBUG_TYPE_MARKER: strType = "DEBUG_TYPE_MARKER"; break;
-        case GL_DEBUG_TYPE_PUSH_GROUP: strType = "DEBUG_TYPE_OTHER"; break;
-        case GL_DEBUG_TYPE_POP_GROUP: strType = "DEBUG_TYPE_POP_GROUP"; break;
-        default: strSource = "(unknown)"; break;
-    }
-
-    std::string strSeverity;
-    mbgl::EventSeverity evtSeverity;
-    switch (severity) {
-        case GL_DEBUG_SEVERITY_HIGH: strSeverity = "DEBUG_SEVERITY_HIGH"; evtSeverity = mbgl::EventSeverity::Error; break;
-        case GL_DEBUG_SEVERITY_MEDIUM: strSeverity = "DEBUG_SEVERITY_MEDIUM"; evtSeverity = mbgl::EventSeverity::Warning; break;
-        case GL_DEBUG_SEVERITY_LOW: strSeverity = "DEBUG_SEVERITY_LOW"; evtSeverity = mbgl::EventSeverity::Info; break;
-        case GL_DEBUG_SEVERITY_NOTIFICATION: strSeverity = "DEBUG_SEVERITY_NOTIFICATION"; evtSeverity = mbgl::EventSeverity::Debug; break;
-        default: strSource = "(unknown)"; evtSeverity = mbgl::EventSeverity::Debug; break;
-    }
-
-    mbgl::Log::Record(evtSeverity, mbgl::Event::OpenGL, "GL_%s GL_%s %u GL_%s - %s", strSource.c_str(), strType.c_str(), id, strSeverity.c_str(), message);
+std::vector<ExtensionFunctionBase*>& ExtensionFunctionBase::functions() {
+    static std::vector<ExtensionFunctionBase*> functions;
+    return functions;
 }
 
-PFNGLINSERTEVENTMARKEREXTPROC InsertEventMarkerEXT = nullptr;
-PFNGLPUSHGROUPMARKEREXTPROC PushGroupMarkerEXT = nullptr;
-PFNGLPOPGROUPMARKEREXTPROC PopGroupMarkerEXT = nullptr;
+static std::once_flag initializeExtensionsOnce;
 
-PFNGLLABELOBJECTEXTPROC LabelObjectEXT = nullptr;
-PFNGLGETOBJECTLABELEXTPROC GetObjectLabelEXT = nullptr;
+void InitializeExtensions(glProc (*getProcAddress)(const char *)) {
+    std::call_once(initializeExtensionsOnce, [getProcAddress] {
+        const char * extensionsPtr = reinterpret_cast<const char *>(
+            MBGL_CHECK_ERROR(glGetString(GL_EXTENSIONS)));
 
-PFNGLBINDVERTEXARRAYPROC BindVertexArray = nullptr;
-PFNGLDELETEVERTEXARRAYSPROC DeleteVertexArrays = nullptr;
-PFNGLGENVERTEXARRAYSPROC GenVertexArrays = nullptr;
-PFNGLISVERTEXARRAYPROC IsVertexArray = nullptr;
+        if (!extensionsPtr)
+            return;
 
-bool isPackedDepthStencilSupported = false;
-
-bool isDepth24Supported = false;
+        const std::string extensions = extensionsPtr;
+        for (auto fn : ExtensionFunctionBase::functions()) {
+            for (auto probe : fn->probes) {
+                if (extensions.find(probe.first) != std::string::npos) {
+                    fn->ptr = getProcAddress(probe.second);
+                    break;
+                }
+            }
+        }
+    });
+}
 
 void checkError(const char *cmd, const char *file, int line) {
     const GLenum err = glGetError();
diff --git a/src/mbgl/renderer/bucket.hpp b/src/mbgl/renderer/bucket.hpp
index a7b0f61a3..711fc4238 100644
--- a/src/mbgl/renderer/bucket.hpp
+++ b/src/mbgl/renderer/bucket.hpp
@@ -1,6 +1,7 @@
 #ifndef MBGL_RENDERER_BUCKET
 #define MBGL_RENDERER_BUCKET
 
+#include <mbgl/renderer/render_pass.hpp>
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/mat4.hpp>
 
@@ -12,10 +13,23 @@ class TileID;
 
 class Bucket : private util::noncopyable {
 public:
+    // As long as this bucket has a Prepare render pass, this function is getting called. Typically,
+    // this only happens once when the bucket is being rendered for the first time.
+    virtual void upload() = 0;
+
+    // Every time this bucket is getting rendered, this function is called. This happens either
+    // once or twice (for Opaque and Transparent render passes).
     virtual void render(Painter&, const StyleLayer&, const TileID&, const mat4&) = 0;
-    virtual bool hasData() const = 0;
+
     virtual ~Bucket() {}
 
+    inline bool needsUpload() const {
+        return !uploaded;
+    }
+
+protected:
+    bool uploaded = false;
+
 };
 
 }
diff --git a/src/mbgl/renderer/debug_bucket.cpp b/src/mbgl/renderer/debug_bucket.cpp
index ed03458da..a315d089e 100644
--- a/src/mbgl/renderer/debug_bucket.cpp
+++ b/src/mbgl/renderer/debug_bucket.cpp
@@ -1,23 +1,29 @@
 #include <mbgl/renderer/debug_bucket.hpp>
 #include <mbgl/renderer/painter.hpp>
+#include <mbgl/shader/plain_shader.hpp>
 
 #include <mbgl/platform/gl.hpp>
 
 #include <cassert>
 
+#ifndef BUFFER_OFFSET
+#define BUFFER_OFFSET(i) ((char *)nullptr + (i))
+#endif
+
 using namespace mbgl;
 
 DebugBucket::DebugBucket(DebugFontBuffer& fontBuffer_)
     : fontBuffer(fontBuffer_) {
 }
 
-void DebugBucket::render(Painter &painter, const StyleLayer & /*layer_desc*/,
-                         const TileID & /*id*/, const mat4 &matrix) {
-    painter.renderDebugText(*this, matrix);
+void DebugBucket::upload() {
+    fontBuffer.upload();
+
+    uploaded = true;
 }
 
-bool DebugBucket::hasData() const {
-    return fontBuffer.index() > 0;
+void DebugBucket::render(Painter& painter, const StyleLayer&, const TileID&, const mat4& matrix) {
+    painter.renderDebugText(*this, matrix);
 }
 
 void DebugBucket::drawLines(PlainShader& shader) {
diff --git a/src/mbgl/renderer/debug_bucket.hpp b/src/mbgl/renderer/debug_bucket.hpp
index 074d1d399..e3c01bbdd 100644
--- a/src/mbgl/renderer/debug_bucket.hpp
+++ b/src/mbgl/renderer/debug_bucket.hpp
@@ -7,10 +7,6 @@
 
 #include <vector>
 
-#ifndef BUFFER_OFFSET
-#define BUFFER_OFFSET(i) ((char *)nullptr + (i))
-#endif
-
 namespace mbgl {
 
 class PlainShader;
@@ -19,9 +15,8 @@ class DebugBucket : public Bucket {
 public:
     DebugBucket(DebugFontBuffer& fontBuffer);
 
-    void render(Painter &painter, const StyleLayer &layer_desc, const TileID &id,
-                const mat4 &matrix) override;
-    bool hasData() const override;
+    void upload() override;
+    void render(Painter&, const StyleLayer&, const TileID&, const mat4&) override;
 
     void drawLines(PlainShader& shader);
     void drawPoints(PlainShader& shader);
diff --git a/src/mbgl/renderer/fill_bucket.cpp b/src/mbgl/renderer/fill_bucket.cpp
index f5726690b..c59b0970e 100644
--- a/src/mbgl/renderer/fill_bucket.cpp
+++ b/src/mbgl/renderer/fill_bucket.cpp
@@ -4,18 +4,23 @@
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/style/style.hpp>
 #include <mbgl/style/style_layout.hpp>
+#include <mbgl/shader/plain_shader.hpp>
+#include <mbgl/shader/pattern_shader.hpp>
+#include <mbgl/shader/outline_shader.hpp>
 #include <mbgl/util/std.hpp>
 #include <mbgl/platform/gl.hpp>
 #include <mbgl/platform/log.hpp>
 
 #include <cassert>
 
+#ifndef BUFFER_OFFSET
+#define BUFFER_OFFSET(i) ((char *)nullptr + (i))
+#endif
+
 struct geometry_too_long_exception : std::exception {};
 
 using namespace mbgl;
 
-
-
 void *FillBucket::alloc(void *, unsigned int size) {
     return ::malloc(size);
 }
@@ -84,7 +89,7 @@ void FillBucket::tessellate() {
     hasVertices = false;
 
     std::vector<std::vector<ClipperLib::IntPoint>> polygons;
-    clipper.Execute(ClipperLib::ctUnion, polygons, ClipperLib::pftPositive);
+    clipper.Execute(ClipperLib::ctUnion, polygons, ClipperLib::pftEvenOdd, ClipperLib::pftEvenOdd);
     clipper.Clear();
 
     if (polygons.size() == 0) {
@@ -132,7 +137,7 @@ void FillBucket::tessellate() {
 
     lineGroup.elements_length += total_vertex_count;
 
-    if (tessTesselate(tesselator, TESS_WINDING_POSITIVE, TESS_POLYGONS, vertices_per_group, vertexSize, 0)) {
+    if (tessTesselate(tesselator, TESS_WINDING_ODD, TESS_POLYGONS, vertices_per_group, vertexSize, 0)) {
         const TESSreal *vertices = tessGetVertices(tesselator);
         const size_t vertex_count = tessGetVertexCount(tesselator);
         TESSindex *vertex_indices = const_cast<TESSindex *>(tessGetVertexIndices(tesselator));
@@ -195,8 +200,19 @@ void FillBucket::tessellate() {
     lineGroup.vertex_length += total_vertex_count;
 }
 
-void FillBucket::render(Painter &painter, const StyleLayer &layer_desc, const TileID &id,
-                        const mat4 &matrix) {
+void FillBucket::upload() {
+    vertexBuffer.upload();
+    triangleElementsBuffer.upload();
+    lineElementsBuffer.upload();
+
+    // From now on, we're going to render during the opaque and translucent pass.
+    uploaded = true;
+}
+
+void FillBucket::render(Painter& painter,
+                        const StyleLayer& layer_desc,
+                        const TileID& id,
+                        const mat4& matrix) {
     painter.renderFill(*this, layer_desc, id, matrix);
 }
 
diff --git a/src/mbgl/renderer/fill_bucket.hpp b/src/mbgl/renderer/fill_bucket.hpp
index d28f849a2..2ff86ba9a 100644
--- a/src/mbgl/renderer/fill_bucket.hpp
+++ b/src/mbgl/renderer/fill_bucket.hpp
@@ -11,10 +11,6 @@
 #include <vector>
 #include <memory>
 
-#ifndef BUFFER_OFFSET
-#define BUFFER_OFFSET(i) ((char *)nullptr + (i))
-#endif
-
 namespace mbgl {
 
 class FillVertexBuffer;
@@ -37,9 +33,9 @@ public:
                LineElementsBuffer &lineElementsBuffer);
     ~FillBucket() override;
 
-    void render(Painter &painter, const StyleLayer &layer_desc, const TileID &id,
-                const mat4 &matrix) override;
-    bool hasData() const override;
+    void upload() override;
+    void render(Painter&, const StyleLayer&, const TileID&, const mat4&) override;
+    bool hasData() const;
 
     void addGeometry(const GeometryCollection&);
     void tessellate();
diff --git a/src/mbgl/renderer/gl_config.cpp b/src/mbgl/renderer/gl_config.cpp
new file mode 100644
index 000000000..ae648d4d3
--- /dev/null
+++ b/src/mbgl/renderer/gl_config.cpp
@@ -0,0 +1,19 @@
+#include "gl_config.hpp"
+
+namespace mbgl {
+namespace gl {
+
+const ClearDepth::Type ClearDepth::Default = 0;
+const ClearColor::Type ClearColor::Default = { 0, 0, 0, 0 };
+const ClearStencil::Type ClearStencil::Default = 0;
+const StencilMask::Type StencilMask::Default = ~0u;
+const DepthMask::Type DepthMask::Default = GL_TRUE;
+const ColorMask::Type ColorMask::Default = { false, false, false, false };
+const StencilFunc::Type StencilFunc::Default = { GL_ALWAYS, 0, ~0u };
+const StencilTest::Type StencilTest::Default = false;
+const DepthRange::Type DepthRange::Default = { 0, 1 };
+const DepthTest::Type DepthTest::Default = false;
+const Blend::Type Blend::Default = false;
+
+}
+}
diff --git a/src/mbgl/renderer/gl_config.hpp b/src/mbgl/renderer/gl_config.hpp
new file mode 100644
index 000000000..59507f721
--- /dev/null
+++ b/src/mbgl/renderer/gl_config.hpp
@@ -0,0 +1,149 @@
+#ifndef MBGL_RENDERER_GL_CONFIG
+#define MBGL_RENDERER_GL_CONFIG
+
+#include <cstdint>
+#include <tuple>
+#include <array>
+
+#include <mbgl/platform/gl.hpp>
+
+namespace mbgl {
+namespace gl {
+
+template <typename T>
+class Value {
+public:
+    inline void operator=(const typename T::Type& value) {
+        if (current != value) {
+            current = value;
+            MBGL_CHECK_ERROR(T::Set(current));
+        }
+    }
+
+private:
+    typename T::Type current = T::Default;
+};
+
+struct ClearDepth {
+    using Type = GLfloat;
+    static const Type Default;
+    inline static void Set(const Type& value) {
+        MBGL_CHECK_ERROR(glClearDepth(value));
+    }
+};
+
+struct ClearColor {
+    struct Type { float r, g, b, a; };
+    static const Type Default;
+    inline static void Set(const Type& value) {
+        MBGL_CHECK_ERROR(glClearColor(value.r, value.g, value.b, value.a));
+    }
+};
+
+inline bool operator!=(const ClearColor::Type& a, const ClearColor::Type& b) {
+    return a.r != b.r || a.g != b.g || a.b != b.b || a.a != b.a;
+}
+
+struct ClearStencil {
+    using Type = GLint;
+    static const Type Default;
+    inline static void Set(const Type& value) {
+        MBGL_CHECK_ERROR(glClearStencil(value));
+    }
+};
+
+struct StencilMask {
+    using Type = GLuint;
+    static const Type Default;
+    inline static void Set(const Type& value) {
+        MBGL_CHECK_ERROR(glStencilMask(value));
+    }
+};
+
+struct DepthMask {
+    using Type = GLboolean;
+    static const Type Default;
+    inline static void Set(const Type& value) {
+        MBGL_CHECK_ERROR(glDepthMask(value));
+    }
+};
+
+struct ColorMask {
+    struct Type { bool r, g, b, a; };
+    static const Type Default;
+    inline static void Set(const Type& value) {
+        MBGL_CHECK_ERROR(glColorMask(value.r, value.g, value.b, value.a));
+    }
+};
+
+inline bool operator!=(const ColorMask::Type& a, const ColorMask::Type& b) {
+    return a.r != b.r || a.g != b.g || a.b != b.b || a.a != b.a;
+}
+
+struct StencilFunc {
+    struct Type { GLenum func; GLint ref; GLuint mask; };
+    static const Type Default;
+    inline static void Set(const Type& value) {
+        MBGL_CHECK_ERROR(glStencilFunc(value.func, value.ref, value.mask));
+    }
+};
+
+inline bool operator!=(const StencilFunc::Type& a, const StencilFunc::Type& b) {
+    return a.func != b.func || a.ref != b.ref || a.mask != b.mask;
+}
+
+struct StencilTest {
+    using Type = bool;
+    static const Type Default;
+    inline static void Set(const Type& value) {
+        MBGL_CHECK_ERROR(value ? glEnable(GL_STENCIL_TEST) : glDisable(GL_STENCIL_TEST));
+    }
+};
+
+struct DepthRange {
+    struct Type { GLfloat near, far; };
+    static const Type Default;
+    inline static void Set(const Type& value) {
+        MBGL_CHECK_ERROR(glDepthRange(value.near, value.far));
+    }
+};
+
+inline bool operator!=(const DepthRange::Type& a, const DepthRange::Type& b) {
+    return a.near != b.near || a.far != b.far;
+}
+
+struct DepthTest {
+    using Type = bool;
+    static const Type Default;
+    inline static void Set(const Type& value) {
+        MBGL_CHECK_ERROR(value ? glEnable(GL_DEPTH_TEST) : glDisable(GL_DEPTH_TEST));
+    }
+};
+
+struct Blend {
+    using Type = bool;
+    static const Type Default;
+    inline static void Set(const Type& value) {
+        MBGL_CHECK_ERROR(value ? glEnable(GL_BLEND) : glDisable(GL_BLEND));
+    }
+};
+
+class Config {
+public:
+    Value<StencilFunc> stencilFunc;
+    Value<StencilMask> stencilMask;
+    Value<StencilTest> stencilTest;
+    Value<DepthRange> depthRange;
+    Value<DepthMask> depthMask;
+    Value<DepthTest> depthTest;
+    Value<Blend> blend;
+    Value<ColorMask> colorMask;
+    Value<ClearDepth> clearDepth;
+    Value<ClearColor> clearColor;
+    Value<ClearStencil> clearStencil;
+};
+
+}
+}
+
+#endif
diff --git a/src/mbgl/renderer/line_bucket.cpp b/src/mbgl/renderer/line_bucket.cpp
index 78da158f1..bbfc02ead 100644
--- a/src/mbgl/renderer/line_bucket.cpp
+++ b/src/mbgl/renderer/line_bucket.cpp
@@ -4,6 +4,9 @@
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/style/style.hpp>
 #include <mbgl/style/style_layout.hpp>
+#include <mbgl/shader/line_shader.hpp>
+#include <mbgl/shader/linesdf_shader.hpp>
+#include <mbgl/shader/linepattern_shader.hpp>
 #include <mbgl/util/math.hpp>
 #include <mbgl/util/std.hpp>
 #include <mbgl/platform/gl.hpp>
@@ -140,7 +143,7 @@ void LineBucket::addGeometry(const std::vector<Coordinate>& vertices) {
         // Find the cosine of the angle between the next and join normals
         // using dot product. The inverse of that is the miter length.
         const float cosHalfAngle = joinNormal.x * nextNormal.x + joinNormal.y * nextNormal.y;
-        const float miterLength = 1 / cosHalfAngle;
+        const float miterLength = cosHalfAngle != 0 ? 1 / cosHalfAngle: 1;
 
         // The join if a middle vertex, otherwise the cap
         const bool middleVertex = prevVertex && nextVertex;
@@ -183,8 +186,9 @@ void LineBucket::addGeometry(const std::vector<Coordinate>& vertices) {
                 // Almost parallel lines
                 joinNormal = nextNormal;
             } else {
+                const float direction = prevNormal.x * nextNormal.y - prevNormal.y * nextNormal.x > 0 ? -1 : 1;
                 const float bevelLength = miterLength * util::mag(prevNormal + nextNormal) /
-                                          util::mag(prevNormal - nextNormal);
+                                          util::mag(prevNormal - nextNormal * direction);
                 joinNormal = util::perp(joinNormal) * bevelLength;
             }
 
@@ -338,6 +342,14 @@ void LineBucket::addCurrentVertex(const Coordinate& currentVertex,
     e2 = e3;
 }
 
+void LineBucket::upload() {
+    vertexBuffer.upload();
+    triangleElementsBuffer.upload();
+
+    // From now on, we're only going to render during the translucent pass.
+    uploaded = true;
+}
+
 void LineBucket::render(Painter& painter,
                         const StyleLayer& layer_desc,
                         const TileID& id,
diff --git a/src/mbgl/renderer/line_bucket.hpp b/src/mbgl/renderer/line_bucket.hpp
index 64f353d7c..6f13e3c81 100644
--- a/src/mbgl/renderer/line_bucket.hpp
+++ b/src/mbgl/renderer/line_bucket.hpp
@@ -28,9 +28,9 @@ public:
     LineBucket(LineVertexBuffer &vertexBuffer, TriangleElementsBuffer &triangleElementsBuffer);
     ~LineBucket() override;
 
-    void render(Painter &painter, const StyleLayer &layer_desc, const TileID &id,
-                const mat4 &matrix) override;
-    bool hasData() const override;
+    void upload() override;
+    void render(Painter&, const StyleLayer&, const TileID&, const mat4&) override;
+    bool hasData() const;
 
     void addGeometry(const GeometryCollection&);
     void addGeometry(const std::vector<Coordinate>& line);
diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp
index 7c6fefdd5..481a4489b 100644
--- a/src/mbgl/renderer/painter.cpp
+++ b/src/mbgl/renderer/painter.cpp
@@ -1,16 +1,35 @@
 #include <mbgl/renderer/painter.hpp>
+
+#include <mbgl/map/source.hpp>
+#include <mbgl/map/tile.hpp>
+
 #include <mbgl/platform/log.hpp>
+#include <mbgl/gl/debugging.hpp>
+
 #include <mbgl/style/style.hpp>
 #include <mbgl/style/style_layer.hpp>
 #include <mbgl/style/style_bucket.hpp>
+
+#include <mbgl/geometry/sprite_atlas.hpp>
+#include <mbgl/geometry/line_atlas.hpp>
+#include <mbgl/geometry/glyph_atlas.hpp>
+
+#include <mbgl/shader/pattern_shader.hpp>
+#include <mbgl/shader/plain_shader.hpp>
+#include <mbgl/shader/outline_shader.hpp>
+#include <mbgl/shader/line_shader.hpp>
+#include <mbgl/shader/linesdf_shader.hpp>
+#include <mbgl/shader/linepattern_shader.hpp>
+#include <mbgl/shader/icon_shader.hpp>
+#include <mbgl/shader/raster_shader.hpp>
+#include <mbgl/shader/sdf_shader.hpp>
+#include <mbgl/shader/dot_shader.hpp>
+#include <mbgl/shader/gaussian_shader.hpp>
+#include <mbgl/shader/box_shader.hpp>
+
 #include <mbgl/util/std.hpp>
-#include <mbgl/util/string.hpp>
-#include <mbgl/util/clip_id.hpp>
 #include <mbgl/util/constants.hpp>
 #include <mbgl/util/mat3.hpp>
-#include <mbgl/geometry/sprite_atlas.hpp>
-#include <mbgl/map/source.hpp>
-#include <mbgl/map/tile.hpp>
 
 #if defined(DEBUG)
 #include <mbgl/util/stopwatch.hpp>
@@ -39,22 +58,7 @@ bool Painter::needsAnimation() const {
 }
 
 void Painter::setup() {
-#if defined(DEBUG)
-    util::stopwatch stopwatch("painter setup");
-#endif
-
-    // Enable GL debugging
-    if ((gl::DebugMessageControl != nullptr) && (gl::DebugMessageCallback != nullptr)) {
-        // This will enable all messages including performance hints
-        //MBGL_CHECK_ERROR(gl::DebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, nullptr, GL_TRUE));
-
-        // This will only enable high and medium severity messages
-        MBGL_CHECK_ERROR(gl::DebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DEBUG_SEVERITY_HIGH, 0, nullptr, GL_TRUE));
-        MBGL_CHECK_ERROR(gl::DebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DEBUG_SEVERITY_MEDIUM, 0, nullptr, GL_TRUE));
-        MBGL_CHECK_ERROR(gl::DebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DEBUG_SEVERITY_NOTIFICATION, 0, nullptr, GL_FALSE));
-
-        MBGL_CHECK_ERROR(gl::DebugMessageCallback(gl::debug_callback, nullptr));
-    }
+    gl::debugging::enable();
 
     setupShaders();
 
@@ -75,16 +79,15 @@ void Painter::setup() {
     // We are blending new pixels on top of old pixels. Since we have depth testing
     // and are drawing opaque fragments first front-to-back, then translucent
     // fragments back-to-front, this shades the fewest fragments possible.
-    MBGL_CHECK_ERROR(glEnable(GL_BLEND));
+    config.blend = true;
     MBGL_CHECK_ERROR(glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA));
 
     // Set clear values
-    MBGL_CHECK_ERROR(glClearColor(0.0f, 0.0f, 0.0f, 0.0f));
-    MBGL_CHECK_ERROR(glClearDepth(1.0f));
-    MBGL_CHECK_ERROR(glClearStencil(0x0));
+    config.clearColor = { 0.0f, 0.0f, 0.0f, 0.0f };
+    config.clearDepth = 1.0f;
+    config.clearStencil = 0x0;
 
     // Stencil test
-    MBGL_CHECK_ERROR(glEnable(GL_STENCIL_TEST));
     MBGL_CHECK_ERROR(glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE));
 
     // Depth test
@@ -107,24 +110,6 @@ void Painter::setupShaders() {
     if (!collisionBoxShader) collisionBoxShader = util::make_unique<CollisionBoxShader>();
 }
 
-void Painter::deleteShaders() {
-    plainShader = nullptr;
-    outlineShader = nullptr;
-    lineShader = nullptr;
-    linepatternShader = nullptr;
-    patternShader = nullptr;
-    iconShader = nullptr;
-    rasterShader = nullptr;
-    sdfGlyphShader = nullptr;
-    sdfIconShader = nullptr;
-    dotShader = nullptr;
-    gaussianShader = nullptr;
-}
-
-void Painter::terminate() {
-    deleteShaders();
-}
-
 void Painter::resize() {
     if (gl_viewport != state.getFramebufferDimensions()) {
         gl_viewport = state.getFramebufferDimensions();
@@ -151,21 +136,6 @@ void Painter::lineWidth(float line_width) {
     }
 }
 
-void Painter::depthMask(bool value) {
-    if (gl_depthMask != value) {
-        MBGL_CHECK_ERROR(glDepthMask(value ? GL_TRUE : GL_FALSE));
-        gl_depthMask = value;
-    }
-}
-
-void Painter::depthRange(const float near, const float far) {
-    if (gl_depthRange[0] != near || gl_depthRange[1] != far) {
-        MBGL_CHECK_ERROR(glDepthRange(near, far));
-        gl_depthRange = {{ near, far }};
-    }
-}
-
-
 void Painter::changeMatrix() {
     // Initialize projection matrix
     matrix::ortho(projMatrix, 0, state.getWidth(), state.getHeight(), 0, 0, 1);
@@ -182,28 +152,15 @@ void Painter::changeMatrix() {
 }
 
 void Painter::clear() {
-    gl::group group("clear");
-    MBGL_CHECK_ERROR(glStencilMask(0xFF));
-    depthMask(true);
-
-    MBGL_CHECK_ERROR(glClearColor(0, 0, 0, 0));
+    gl::debugging::group group("clear");
+    config.stencilTest = true;
+    config.stencilMask = 0xFF;
+    config.depthTest = false;
+    config.depthMask = GL_TRUE;
+    config.clearColor = { 0.0f, 0.0f, 0.0f, 0.0f };
     MBGL_CHECK_ERROR(glClear(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT | GL_DEPTH_BUFFER_BIT));
 }
 
-void Painter::setOpaque() {
-    if (pass != RenderPass::Opaque) {
-        pass = RenderPass::Opaque;
-        MBGL_CHECK_ERROR(glDisable(GL_BLEND));
-    }
-}
-
-void Painter::setTranslucent() {
-    if (pass != RenderPass::Translucent) {
-        pass = RenderPass::Translucent;
-        MBGL_CHECK_ERROR(glEnable(GL_BLEND));
-    }
-}
-
 void Painter::setStrata(float value) {
     strata = value;
 }
@@ -211,16 +168,12 @@ void Painter::setStrata(float value) {
 void Painter::prepareTile(const Tile& tile) {
     const GLint ref = (GLint)tile.clip.reference.to_ulong();
     const GLuint mask = (GLuint)tile.clip.mask.to_ulong();
-    MBGL_CHECK_ERROR(glStencilFunc(GL_EQUAL, ref, mask));
+    config.stencilFunc = { GL_EQUAL, ref, mask };
 }
 
 void Painter::render(const Style& style, TransformState state_, TimePoint time) {
     state = state_;
 
-    clear();
-    resize();
-    changeMatrix();
-
     std::set<Source*> sources;
     for (const auto& source : style.sources) {
         if (source->enabled) {
@@ -228,14 +181,47 @@ void Painter::render(const Style& style, TransformState state_, TimePoint time)
         }
     }
 
-    // Update all clipping IDs.
-    ClipIDGenerator generator;
-    for (const auto& source : sources) {
-        generator.update(source->getLoadedTiles());
-        source->updateMatrices(projMatrix, state);
+    resize();
+    changeMatrix();
+
+    // Figure out what buckets we have to draw and what order we have to draw them in.
+    const auto order = determineRenderOrder(style);
+
+    // - UPLOAD PASS -------------------------------------------------------------------------------
+    // Uploads all required buffers and images before we do any actual rendering.
+    {
+        const gl::debugging::group upload("upload");
+
+        tileStencilBuffer.upload();
+        tileBorderBuffer.upload();
+        spriteAtlas.upload();
+        lineAtlas.upload();
+        glyphAtlas.upload();
+
+        for (const auto& item : order) {
+            if (item.bucket && item.bucket->needsUpload()) {
+                item.bucket->upload();
+            }
+        }
     }
 
-    drawClippingMasks(sources);
+
+    // - CLIPPING MASKS ----------------------------------------------------------------------------
+    // Draws the clipping masks to the stencil buffer.
+    {
+        const gl::debugging::group clip("clip");
+
+        // Update all clipping IDs.
+        ClipIDGenerator generator;
+        for (const auto& source : sources) {
+            generator.update(source->getLoadedTiles());
+            source->updateMatrices(projMatrix, state);
+        }
+
+        clear();
+
+        drawClippingMasks(sources);
+    }
 
     frameHistory.record(time, state.getNormalizedZoom());
 
@@ -243,122 +229,160 @@ void Painter::render(const Style& style, TransformState state_, TimePoint time)
     if (debug::renderTree) { Log::Info(Event::Render, "{"); indent++; }
 
     // TODO: Correctly compute the number of layers recursively beforehand.
-    float strata_thickness = 1.0f / (style.layers.size() + 1);
+    const float strataThickness = 1.0f / (order.size() + 1);
 
-    // - FIRST PASS ------------------------------------------------------------
-    // Render everything top-to-bottom by using reverse iterators. Render opaque
-    // objects first.
+    // - OPAQUE PASS -------------------------------------------------------------------------------
+    // Render everything top-to-bottom by using reverse iterators. Render opaque objects first.
+    renderPass(RenderPass::Opaque,
+               order.rbegin(), order.rend(),
+               0, 1, strataThickness);
 
-    if (debug::renderTree) {
-        Log::Info(Event::Render, "%*s%s", indent++ * 4, "", "OPAQUE {");
-    }
-    int i = 0;
-    for (auto it = style.layers.rbegin(), end = style.layers.rend(); it != end; ++it, ++i) {
-        setOpaque();
-        setStrata(i * strata_thickness);
-        renderLayer(**it);
-    }
-    if (debug::renderTree) {
-        Log::Info(Event::Render, "%*s%s", --indent * 4, "", "}");
-    }
-
-    // - SECOND PASS -----------------------------------------------------------
-    // Make a second pass, rendering translucent objects. This time, we render
-    // bottom-to-top.
-    if (debug::renderTree) {
-        Log::Info(Event::Render, "%*s%s", indent++ * 4, "", "TRANSLUCENT {");
-    }
-    --i;
-    for (auto it = style.layers.begin(), end = style.layers.end(); it != end; ++it, --i) {
-        setTranslucent();
-        setStrata(i * strata_thickness);
-        renderLayer(**it);
-    }
-    if (debug::renderTree) {
-        Log::Info(Event::Render, "%*s%s", --indent * 4, "", "}");
-    }
+    // - TRANSLUCENT PASS --------------------------------------------------------------------------
+    // Make a second pass, rendering translucent objects. This time, we render bottom-to-top.
+    renderPass(RenderPass::Translucent,
+               order.begin(), order.end(),
+               order.size() - 1, -1, strataThickness);
 
     if (debug::renderTree) { Log::Info(Event::Render, "}"); indent--; }
 
-    // Finalize the rendering, e.g. by calling debug render calls per tile.
-    // This guarantees that we have at least one function per tile called.
-    // When only rendering layers via the stylesheet, it's possible that we don't
-    // ever visit a tile during rendering.
-    for (const auto& source : sources) {
-        source->finishRender(*this);
+    // - DEBUG PASS --------------------------------------------------------------------------------
+    // Renders debug overlays.
+    {
+        const gl::debugging::group _("debug");
+
+        // Finalize the rendering, e.g. by calling debug render calls per tile.
+        // This guarantees that we have at least one function per tile called.
+        // When only rendering layers via the stylesheet, it's possible that we don't
+        // ever visit a tile during rendering.
+        for (const auto& source : sources) {
+            source->finishRender(*this);
+        }
+    }
+
+    // TODO: Find a better way to unbind VAOs after we're done with them without introducing
+    // unnecessary bind(0)/bind(N) sequences.
+    {
+        const gl::debugging::group _("cleanup");
+
+        MBGL_CHECK_ERROR(glBindTexture(GL_TEXTURE_2D, 0));
+        MBGL_CHECK_ERROR(VertexArrayObject::Unbind());
     }
 }
 
-void Painter::renderLayer(const StyleLayer &layer_desc) {
-    if (layer_desc.bucket->visibility == VisibilityType::None) return;
-    if (layer_desc.type == StyleLayerType::Background) {
-        // This layer defines a background color/image.
+template <class Iterator>
+void Painter::renderPass(RenderPass pass_,
+                         Iterator it, Iterator end,
+                         std::size_t i, int8_t increment,
+                         const float strataThickness) {
+    pass = pass_;
 
-        if (debug::renderTree) {
-            Log::Info(Event::Render, "%*s- %s (%s)", indent * 4, "", layer_desc.id.c_str(),
-                    StyleLayerTypeClass(layer_desc.type).c_str());
+    const char * passName = pass == RenderPass::Opaque ? "opaque" : "translucent";
+    const gl::debugging::group _(passName);
+
+    if (debug::renderTree) {
+        Log::Info(Event::Render, "%*s%s {", indent++ * 4, "", passName);
+    }
+
+    config.blend = pass == RenderPass::Translucent;
+
+    for (; it != end; ++it, i += increment) {
+        const auto& item = *it;
+        if (item.bucket && item.tile) {
+            if (item.hasRenderPass(pass)) {
+                const gl::debugging::group group(item.layer.id + " - " + std::string(item.tile->id));
+                setStrata(i * strataThickness);
+                prepareTile(*item.tile);
+                item.bucket->render(*this, item.layer, item.tile->id, item.tile->matrix);
+            }
+        } else {
+            const gl::debugging::group group("background");
+            setStrata(i * strataThickness);
+            renderBackground(item.layer);
+        }
+    }
+
+    if (debug::renderTree) {
+        Log::Info(Event::Render, "%*s%s", --indent * 4, "", "}");
+    }
+}
+
+std::vector<RenderItem> Painter::determineRenderOrder(const Style& style) {
+    std::vector<RenderItem> order;
+
+    for (const auto& layerPtr : style.layers) {
+        const auto& layer = *layerPtr;
+        if (layer.bucket->visibility == VisibilityType::None) continue;
+        if (layer.type == StyleLayerType::Background) {
+            // This layer defines a background color/image.
+            order.emplace_back(layer);
+            continue;
         }
 
-        renderBackground(layer_desc);
-    } else {
         // This is a singular layer.
-        if (!layer_desc.bucket) {
-            Log::Warning(Event::Render, "layer '%s' is missing bucket", layer_desc.id.c_str());
-            return;
+        if (!layer.bucket) {
+            Log::Warning(Event::Render, "layer '%s' is missing bucket", layer.id.c_str());
+            continue;
         }
 
-        if (!layer_desc.bucket->source) {
-            Log::Warning(Event::Render, "can't find source for layer '%s'", layer_desc.id.c_str());
-            return;
+        if (!layer.bucket->source) {
+            Log::Warning(Event::Render, "can't find source for layer '%s'", layer.id.c_str());
+            continue;
         }
 
         // Skip this layer if it's outside the range of min/maxzoom.
         // This may occur when there /is/ a bucket created for this layer, but the min/max-zoom
         // is set to a fractional value, or value that is larger than the source maxzoom.
         const double zoom = state.getZoom();
-        if (layer_desc.bucket->min_zoom > zoom ||
-            layer_desc.bucket->max_zoom <= zoom) {
-            return;
+        if (layer.bucket->min_zoom > zoom ||
+            layer.bucket->max_zoom <= zoom) {
+            continue;
         }
 
-        // Abort early if we can already deduce from the bucket type that
-        // we're not going to render anything anyway during this pass.
-        switch (layer_desc.type) {
-            case StyleLayerType::Fill:
-                if (!layer_desc.getProperties<FillProperties>().isVisible()) return;
-                break;
-            case StyleLayerType::Line:
-                if (pass == RenderPass::Opaque) return;
-                if (!layer_desc.getProperties<LineProperties>().isVisible()) return;
-                break;
-            case StyleLayerType::Symbol:
-                if (pass == RenderPass::Opaque) return;
-                if (!layer_desc.getProperties<SymbolProperties>().isVisible()) return;
-                break;
-            case StyleLayerType::Raster:
-                if (pass == RenderPass::Opaque) return;
-                if (!layer_desc.getProperties<RasterProperties>().isVisible()) return;
-                break;
-            default:
-                break;
+        // Don't include invisible layers.
+        if (!layer.isVisible()) {
+            continue;
         }
 
-        if (debug::renderTree) {
-            Log::Info(Event::Render, "%*s- %s (%s)", indent * 4, "", layer_desc.id.c_str(),
-                    StyleLayerTypeClass(layer_desc.type).c_str());
-        }
+        // Determine what render passes we need for this layer.
+        const RenderPass passes = determineRenderPasses(layer);
 
-        layer_desc.bucket->source->render(*this, layer_desc);
+        const auto& tiles = layer.bucket->source->getTiles();
+        for (auto tile : tiles) {
+            assert(tile);
+            if (!tile->data && !tile->data->isReady()) {
+                continue;
+            }
+
+            auto bucket = tile->data->getBucket(layer);
+            if (bucket) {
+                order.emplace_back(layer, tile, bucket, passes);
+            }
+        }
     }
+
+    return order;
 }
 
-void Painter::renderTileLayer(const Tile& tile, const StyleLayer &layer_desc, const mat4 &matrix) {
-    assert(tile.data);
-    if (tile.data->hasData(layer_desc) || layer_desc.type == StyleLayerType::Raster) {
-        gl::group group(std::string { "render " } + tile.data->name);
-        prepareTile(tile);
-        tile.data->render(*this, layer_desc, matrix);
+RenderPass Painter::determineRenderPasses(const StyleLayer& layer) {
+    RenderPass passes = RenderPass::None;
+
+    if (layer.properties.is<FillProperties>()) {
+        const FillProperties &properties = layer.properties.get<FillProperties>();
+        const float alpha = properties.fill_color[3] * properties.opacity;
+
+        if (properties.antialias) {
+            passes |= RenderPass::Translucent;
+        }
+        if (properties.image.from.size() || alpha < 1.0f) {
+            passes |= RenderPass::Translucent;
+        } else {
+            passes |= RenderPass::Opaque;
+        }
+    } else {
+        passes |= RenderPass::Translucent;
     }
+
+    return passes;
 }
 
 void Painter::renderBackground(const StyleLayer &layer_desc) {
@@ -435,10 +459,10 @@ void Painter::renderBackground(const StyleLayer &layer_desc) {
         backgroundArray.bind(*plainShader, backgroundBuffer, BUFFER_OFFSET(0));
     }
 
-    MBGL_CHECK_ERROR(glDisable(GL_STENCIL_TEST));
-    depthRange(strata + strata_epsilon, 1.0f);
+    config.stencilTest = false;
+    config.depthTest = true;
+    config.depthRange = { strata + strata_epsilon, 1.0f };
     MBGL_CHECK_ERROR(glDrawArrays(GL_TRIANGLE_STRIP, 0, 4));
-    MBGL_CHECK_ERROR(glEnable(GL_STENCIL_TEST));
 }
 
 mat4 Painter::translatedMatrix(const mat4& matrix, const std::array<float, 2> &translation, const TileID &id, TranslateAnchorType anchor) {
diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp
index 07fffa4dd..ccef94cd3 100644
--- a/src/mbgl/renderer/painter.hpp
+++ b/src/mbgl/renderer/painter.hpp
@@ -1,61 +1,82 @@
 #ifndef MBGL_RENDERER_PAINTER
 #define MBGL_RENDERER_PAINTER
 
-#include <mbgl/map/tile_data.hpp>
+#include <mbgl/map/transform_state.hpp>
+
+#include <mbgl/renderer/frame_history.hpp>
+#include <mbgl/renderer/bucket.hpp>
+
 #include <mbgl/geometry/vao.hpp>
 #include <mbgl/geometry/static_vertex_buffer.hpp>
-#include <mbgl/util/mat4.hpp>
-#include <mbgl/util/noncopyable.hpp>
-#include <mbgl/renderer/frame_history.hpp>
+
+#include <mbgl/renderer/gl_config.hpp>
+
 #include <mbgl/style/types.hpp>
 
-#include <mbgl/shader/plain_shader.hpp>
-#include <mbgl/shader/outline_shader.hpp>
-#include <mbgl/shader/pattern_shader.hpp>
-#include <mbgl/shader/line_shader.hpp>
-#include <mbgl/shader/linesdf_shader.hpp>
-#include <mbgl/shader/linepattern_shader.hpp>
-#include <mbgl/shader/icon_shader.hpp>
-#include <mbgl/shader/raster_shader.hpp>
-#include <mbgl/shader/sdf_shader.hpp>
-#include <mbgl/shader/dot_shader.hpp>
-#include <mbgl/shader/gaussian_shader.hpp>
-#include <mbgl/shader/box_shader.hpp>
+#include <mbgl/platform/gl.hpp>
 
-#include <mbgl/map/transform_state.hpp>
-#include <mbgl/util/ptr.hpp>
+#include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/chrono.hpp>
 
-#include <map>
-#include <unordered_map>
+#include <array>
+#include <vector>
 #include <set>
 
 namespace mbgl {
 
-enum class RenderPass : bool { Opaque, Translucent };
-
-class Transform;
 class Style;
+class StyleLayer;
 class Tile;
-class Sprite;
 class SpriteAtlas;
 class GlyphAtlas;
 class LineAtlas;
 class Source;
 
+
+class DebugBucket;
 class FillBucket;
 class LineBucket;
 class SymbolBucket;
 class RasterBucket;
-class PrerenderedTexture;
 
-struct FillProperties;
 struct RasterProperties;
 
-class LayerDescription;
-class RasterTileData;
+class SDFShader;
+class PlainShader;
+class OutlineShader;
+class LineShader;
+class LinejoinShader;
+class LineSDFShader;
+class LinepatternShader;
+class PatternShader;
+class IconShader;
+class RasterShader;
+class SDFGlyphShader;
+class SDFIconShader;
+class DotShader;
+class GaussianShader;
+class CollisionBoxShader;
+
 struct ClipID;
 
+struct RenderItem {
+    inline RenderItem(const StyleLayer& layer_,
+                      const Tile* tile_ = nullptr,
+                      Bucket* bucket_ = nullptr,
+                      RenderPass passes_ = RenderPass::Opaque)
+        : tile(tile_), bucket(bucket_), layer(layer_), passes(passes_) {
+    }
+
+    const Tile* const tile;
+    Bucket* const bucket;
+    const StyleLayer& layer;
+    const RenderPass passes;
+
+    inline bool hasRenderPass(RenderPass pass) const {
+        return bool(passes & pass);
+    }
+};
+
 class Painter : private util::noncopyable {
 public:
     Painter(SpriteAtlas&, GlyphAtlas&, LineAtlas&);
@@ -63,11 +84,6 @@ public:
 
     void setup();
 
-    // Perform cleanup tasks that prepare shutting down the app. This doesn't mean that the
-    // app will be shut down. That means all operations must be automatically be reversed (e.g. through
-    // lazy initialization) in case rendering continues.
-    void terminate();
-
     // Renders the backdrop of the OpenGL view. This also paints in areas where we don't have any
     // tiles whatsoever.
     void clear();
@@ -79,11 +95,6 @@ public:
                 TransformState state,
                 TimePoint time);
 
-    void renderLayer(const StyleLayer&);
-
-    // Renders a particular layer from a tile.
-    void renderTileLayer(const Tile& tile, const StyleLayer &layer_desc, const mat4 &matrix);
-
     // Renders debug information for a tile.
     void renderTileDebug(const Tile& tile);
 
@@ -113,10 +124,6 @@ public:
     // Changes whether debug information is drawn onto the map
     void setDebug(bool enabled);
 
-    // Opaque/Translucent pass setting
-    void setOpaque();
-    void setTranslucent();
-
     // Configures the painter strata that is used for early z-culling of fragments.
     void setStrata(float strata);
 
@@ -133,9 +140,17 @@ public:
 
 private:
     void setupShaders();
-    void deleteShaders();
     mat4 translatedMatrix(const mat4& matrix, const std::array<float, 2> &translation, const TileID &id, TranslateAnchorType anchor);
 
+    std::vector<RenderItem> determineRenderOrder(const Style& style);
+    static RenderPass determineRenderPasses(const StyleLayer&);
+
+    template <class Iterator>
+    void renderPass(RenderPass,
+                    Iterator it, Iterator end,
+                    std::size_t i, int8_t iIncrement,
+                    const float strataThickness);
+
     void prepareTile(const Tile& tile);
 
     template <typename BucketProperties, typename StyleProperties>
@@ -152,8 +167,6 @@ private:
 public:
     void useProgram(uint32_t program);
     void lineWidth(float lineWidth);
-    void depthMask(bool value);
-    void depthRange(float near, float far);
 
 public:
     mat4 projMatrix;
@@ -180,11 +193,11 @@ private:
     bool debug = false;
     int indent = 0;
 
+    gl::Config config;
+
     uint32_t gl_program = 0;
     float gl_lineWidth = 0;
-    bool gl_depthMask = true;
     std::array<uint16_t, 2> gl_viewport = {{ 0, 0 }};
-    std::array<float, 2> gl_depthRange = {{ 0, 1 }};
     float strata = 0;
     RenderPass pass = RenderPass::Opaque;
     const float strata_epsilon = 1.0f / (1 << 16);
diff --git a/src/mbgl/renderer/painter_clipping.cpp b/src/mbgl/renderer/painter_clipping.cpp
index 3a981ed1e..c2a8e6f50 100644
--- a/src/mbgl/renderer/painter_clipping.cpp
+++ b/src/mbgl/renderer/painter_clipping.cpp
@@ -1,20 +1,24 @@
 #include <mbgl/renderer/painter.hpp>
-#include <mbgl/renderer/fill_bucket.hpp>
-#include <mbgl/map/map.hpp>
-#include <mbgl/map/tile.hpp>
 #include <mbgl/map/source.hpp>
+#include <mbgl/shader/plain_shader.hpp>
 #include <mbgl/util/clip_id.hpp>
+#include <mbgl/gl/debugging.hpp>
+
+#ifndef BUFFER_OFFSET
+#define BUFFER_OFFSET(i) ((char *)nullptr + (i))
+#endif
 
 using namespace mbgl;
 
 void Painter::drawClippingMasks(const std::set<Source*>& sources) {
-    gl::group group("clipping masks");
+    gl::debugging::group group("clipping masks");
 
     useProgram(plainShader->program);
-    MBGL_CHECK_ERROR(glDisable(GL_DEPTH_TEST));
-    depthMask(false);
-    MBGL_CHECK_ERROR(glColorMask(false, false, false, false));
-    depthRange(1.0f, 1.0f);
+    config.stencilTest = true;
+    config.depthTest = true;
+    config.depthMask = GL_FALSE;
+    config.colorMask = { false, false, false, false };
+    config.depthRange = { 1.0f, 1.0f };
 
     coveringPlainArray.bind(*plainShader, tileStencilBuffer, BUFFER_OFFSET(0));
 
@@ -22,10 +26,10 @@ void Painter::drawClippingMasks(const std::set<Source*>& sources) {
         source->drawClippingMasks(*this);
     }
 
-    MBGL_CHECK_ERROR(glEnable(GL_DEPTH_TEST));
-    MBGL_CHECK_ERROR(glColorMask(true, true, true, true));
-    depthMask(true);
-    MBGL_CHECK_ERROR(glStencilMask(0x0));
+    config.depthTest = true;
+    config.colorMask = { true, true, true, true };
+    config.depthMask = GL_TRUE;
+    config.stencilMask = 0x0;
 }
 
 void Painter::drawClippingMask(const mat4& matrix, const ClipID &clip) {
@@ -33,8 +37,7 @@ void Painter::drawClippingMask(const mat4& matrix, const ClipID &clip) {
 
     const GLint ref = (GLint)(clip.reference.to_ulong());
     const GLuint mask = (GLuint)(clip.mask.to_ulong());
-    MBGL_CHECK_ERROR(glStencilFunc(GL_ALWAYS, ref, mask));
-    MBGL_CHECK_ERROR(glStencilMask(mask));
-
+    config.stencilFunc = { GL_ALWAYS, ref, mask };
+    config.stencilMask = mask;
     MBGL_CHECK_ERROR(glDrawArrays(GL_TRIANGLES, 0, (GLsizei)tileStencilBuffer.index()));
 }
diff --git a/src/mbgl/renderer/painter_debug.cpp b/src/mbgl/renderer/painter_debug.cpp
index 293147328..d4306d3e1 100644
--- a/src/mbgl/renderer/painter_debug.cpp
+++ b/src/mbgl/renderer/painter_debug.cpp
@@ -1,13 +1,19 @@
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/renderer/debug_bucket.hpp>
-#include <mbgl/map/map.hpp>
 #include <mbgl/map/tile.hpp>
+#include <mbgl/map/tile_data.hpp>
+#include <mbgl/shader/plain_shader.hpp>
 #include <mbgl/util/string.hpp>
+#include <mbgl/gl/debugging.hpp>
+
+#ifndef BUFFER_OFFSET
+#define BUFFER_OFFSET(i) ((char *)nullptr + (i))
+#endif
 
 using namespace mbgl;
 
 void Painter::renderTileDebug(const Tile& tile) {
-    gl::group group(std::string { "debug " } + std::string(tile.id));
+    gl::debugging::group group(std::string { "debug " } + std::string(tile.id));
     assert(tile.data);
     if (debug) {
         prepareTile(tile);
@@ -17,9 +23,9 @@ void Painter::renderTileDebug(const Tile& tile) {
 }
 
 void Painter::renderDebugText(DebugBucket& bucket, const mat4 &matrix) {
-    gl::group group("debug text");
+    gl::debugging::group group("debug text");
 
-    MBGL_CHECK_ERROR(glDisable(GL_DEPTH_TEST));
+    config.depthTest = false;
 
     useProgram(plainShader->program);
     plainShader->u_matrix = matrix;
@@ -40,16 +46,17 @@ void Painter::renderDebugText(DebugBucket& bucket, const mat4 &matrix) {
     lineWidth(2.0f * state.getPixelRatio());
     bucket.drawLines(*plainShader);
 
-    MBGL_CHECK_ERROR(glEnable(GL_DEPTH_TEST));
+    config.depthTest = true;
 }
 
 void Painter::renderDebugFrame(const mat4 &matrix) {
-    gl::group group("debug frame");
+    gl::debugging::group group("debug frame");
 
     // Disable depth test and don't count this towards the depth buffer,
     // but *don't* disable stencil test, as we want to clip the red tile border
     // to the tile viewport.
-    MBGL_CHECK_ERROR(glDisable(GL_DEPTH_TEST));
+    config.depthTest = false;
+    config.stencilTest = true;
 
     useProgram(plainShader->program);
     plainShader->u_matrix = matrix;
@@ -59,8 +66,6 @@ void Painter::renderDebugFrame(const mat4 &matrix) {
     plainShader->u_color = {{ 1.0f, 0.0f, 0.0f, 1.0f }};
     lineWidth(4.0f * state.getPixelRatio());
     MBGL_CHECK_ERROR(glDrawArrays(GL_LINE_STRIP, 0, (GLsizei)tileBorderBuffer.index()));
-
-    MBGL_CHECK_ERROR(glEnable(GL_DEPTH_TEST));
 }
 
 void Painter::renderDebugText(const std::vector<std::string> &strings) {
@@ -68,10 +73,11 @@ void Painter::renderDebugText(const std::vector<std::string> &strings) {
         return;
     }
 
-    gl::group group("debug text");
+    gl::debugging::group group("debug text");
 
-    MBGL_CHECK_ERROR(glDisable(GL_DEPTH_TEST));
-    MBGL_CHECK_ERROR(glStencilFunc(GL_ALWAYS, 0xFF, 0xFF));
+    config.depthTest = false;
+    config.stencilTest = true;
+    config.stencilFunc = { GL_ALWAYS, 0xFF, 0xFF };
 
     useProgram(plainShader->program);
     plainShader->u_matrix = nativeMatrix;
@@ -98,6 +104,4 @@ void Painter::renderDebugText(const std::vector<std::string> &strings) {
         lineWidth(2.0f * state.getPixelRatio());
         MBGL_CHECK_ERROR(glDrawArrays(GL_LINES, 0, (GLsizei)debugFontBuffer.index()));
     }
-
-    MBGL_CHECK_ERROR(glEnable(GL_DEPTH_TEST));
 }
diff --git a/src/mbgl/renderer/painter_fill.cpp b/src/mbgl/renderer/painter_fill.cpp
index 8025cf346..6f6783f0e 100644
--- a/src/mbgl/renderer/painter_fill.cpp
+++ b/src/mbgl/renderer/painter_fill.cpp
@@ -3,18 +3,18 @@
 #include <mbgl/style/style.hpp>
 #include <mbgl/style/style_layer.hpp>
 #include <mbgl/style/style_layout.hpp>
-#include <mbgl/map/map.hpp>
 #include <mbgl/map/sprite.hpp>
+#include <mbgl/map/tile_id.hpp>
 #include <mbgl/geometry/sprite_atlas.hpp>
+#include <mbgl/shader/outline_shader.hpp>
+#include <mbgl/shader/pattern_shader.hpp>
+#include <mbgl/shader/plain_shader.hpp>
 #include <mbgl/util/std.hpp>
 #include <mbgl/util/mat3.hpp>
 
 using namespace mbgl;
 
 void Painter::renderFill(FillBucket& bucket, const StyleLayer &layer_desc, const TileID& id, const mat4 &matrix) {
-    // Abort early.
-    if (!bucket.hasData()) return;
-
     const FillProperties &properties = layer_desc.getProperties<FillProperties>();
     mat4 vtxMatrix = translatedMatrix(matrix, properties.translate, id, properties.translateAnchor);
 
@@ -39,6 +39,9 @@ void Painter::renderFill(FillBucket& bucket, const StyleLayer &layer_desc, const
     bool outline = properties.antialias && !pattern && stroke_color != fill_color;
     bool fringeline = properties.antialias && !pattern && stroke_color == fill_color;
 
+    config.stencilTest = true;
+    config.depthTest = true;
+
     // Because we're drawing top-to-bottom, and we update the stencil mask
     // befrom, we have to draw the outline first (!)
     if (outline && pass == RenderPass::Translucent) {
@@ -53,7 +56,7 @@ void Painter::renderFill(FillBucket& bucket, const StyleLayer &layer_desc, const
             static_cast<float>(state.getFramebufferWidth()),
             static_cast<float>(state.getFramebufferHeight())
         }};
-        depthRange(strata, 1.0f);
+        config.depthRange = { strata, 1.0f };
         bucket.drawVertices(*outlineShader);
     }
 
@@ -92,8 +95,8 @@ void Painter::renderFill(FillBucket& bucket, const StyleLayer &layer_desc, const
             spriteAtlas.bind(true);
 
             // Draw the actual triangles into the color & stencil buffer.
-            depthMask(true);
-            depthRange(strata, 1.0f);
+            config.depthMask = GL_TRUE;
+            config.depthRange = { strata, 1.0f };
             bucket.drawElements(*patternShader);
         }
     }
@@ -109,8 +112,8 @@ void Painter::renderFill(FillBucket& bucket, const StyleLayer &layer_desc, const
             plainShader->u_color = fill_color;
 
             // Draw the actual triangles into the color & stencil buffer.
-            depthMask(true);
-            depthRange(strata + strata_epsilon, 1.0f);
+            config.depthMask = GL_TRUE;
+            config.depthRange = { strata + strata_epsilon, 1.0f };
             bucket.drawElements(*plainShader);
         }
     }
@@ -130,7 +133,7 @@ void Painter::renderFill(FillBucket& bucket, const StyleLayer &layer_desc, const
             static_cast<float>(state.getFramebufferHeight())
         }};
 
-        depthRange(strata + strata_epsilon + strata_epsilon, 1.0f);
+        config.depthRange = { strata + strata_epsilon + strata_epsilon, 1.0f };
         bucket.drawVertices(*outlineShader);
     }
 }
diff --git a/src/mbgl/renderer/painter_line.cpp b/src/mbgl/renderer/painter_line.cpp
index 57690da46..f552ea6c4 100644
--- a/src/mbgl/renderer/painter_line.cpp
+++ b/src/mbgl/renderer/painter_line.cpp
@@ -4,18 +4,22 @@
 #include <mbgl/style/style_layer.hpp>
 #include <mbgl/style/style_layout.hpp>
 #include <mbgl/map/sprite.hpp>
+#include <mbgl/map/tile_id.hpp>
+#include <mbgl/shader/line_shader.hpp>
+#include <mbgl/shader/linesdf_shader.hpp>
+#include <mbgl/shader/linepattern_shader.hpp>
 #include <mbgl/geometry/sprite_atlas.hpp>
 #include <mbgl/geometry/line_atlas.hpp>
-#include <mbgl/map/map.hpp>
 
 using namespace mbgl;
 
 void Painter::renderLine(LineBucket& bucket, const StyleLayer &layer_desc, const TileID& id, const mat4 &matrix) {
     // Abort early.
     if (pass == RenderPass::Opaque) return;
-    if (!bucket.hasData()) return;
 
-    depthMask(false);
+    config.stencilTest = true;
+    config.depthTest = true;
+    config.depthMask = GL_FALSE;
 
     const auto &properties = layer_desc.getProperties<LineProperties>();
     const auto &layout = bucket.layout;
@@ -49,7 +53,7 @@ void Painter::renderLine(LineBucket& bucket, const StyleLayer &layer_desc, const
     float ratio = state.getPixelRatio();
     mat4 vtxMatrix = translatedMatrix(matrix, properties.translate, id, properties.translateAnchor);
 
-    depthRange(strata, 1.0f);
+    config.depthRange = { strata, 1.0f };
 
     if (properties.dash_array.from.size()) {
 
@@ -107,7 +111,7 @@ void Painter::renderLine(LineBucket& bucket, const StyleLayer &layer_desc, const
 
         MBGL_CHECK_ERROR(glActiveTexture(GL_TEXTURE0));
         spriteAtlas.bind(true);
-        MBGL_CHECK_ERROR(glDepthRange(strata + strata_epsilon, 1.0f));  // may or may not matter
+        config.depthRange = { strata + strata_epsilon, 1.0f };  // may or may not matter
 
         bucket.drawLinePatterns(*linepatternShader);
 
diff --git a/src/mbgl/renderer/painter_raster.cpp b/src/mbgl/renderer/painter_raster.cpp
index 5fac248ee..61aff9c1a 100644
--- a/src/mbgl/renderer/painter_raster.cpp
+++ b/src/mbgl/renderer/painter_raster.cpp
@@ -2,8 +2,8 @@
 #include <mbgl/platform/gl.hpp>
 #include <mbgl/renderer/raster_bucket.hpp>
 #include <mbgl/style/style_layer.hpp>
+#include <mbgl/shader/raster_shader.hpp>
 #include <mbgl/util/std.hpp>
-#include <mbgl/map/map.hpp>
 
 using namespace mbgl;
 
@@ -23,8 +23,9 @@ void Painter::renderRaster(RasterBucket& bucket, const StyleLayer &layer_desc, c
         rasterShader->u_contrast_factor = contrastFactor(properties.contrast);
         rasterShader->u_spin_weights = spinWeights(properties.hue_rotate);
 
-        depthRange(strata + strata_epsilon, 1.0f);
-
+        config.stencilTest = true;
+        config.depthTest = true;
+        config.depthRange = { strata + strata_epsilon, 1.0f };
         bucket.drawRaster(*rasterShader, tileStencilBuffer, coveringRasterArray);
     }
 }
diff --git a/src/mbgl/renderer/painter_symbol.cpp b/src/mbgl/renderer/painter_symbol.cpp
index c2463523d..73b3c4162 100644
--- a/src/mbgl/renderer/painter_symbol.cpp
+++ b/src/mbgl/renderer/painter_symbol.cpp
@@ -4,7 +4,10 @@
 #include <mbgl/style/style_layout.hpp>
 #include <mbgl/geometry/glyph_atlas.hpp>
 #include <mbgl/geometry/sprite_atlas.hpp>
-#include <mbgl/map/map.hpp>
+#include <mbgl/shader/sdf_shader.hpp>
+#include <mbgl/shader/icon_shader.hpp>
+#include <mbgl/shader/box_shader.hpp>
+#include <mbgl/map/tile_id.hpp>
 #include <mbgl/util/math.hpp>
 
 #include <cmath>
@@ -81,7 +84,7 @@ void Painter::renderSDF(SymbolBucket &bucket,
 
         sdfShader.u_buffer = (haloOffset - styleProperties.halo_width / fontScale) / sdfPx;
 
-        depthRange(strata, 1.0f);
+        config.depthRange = { strata, 1.0f };
         (bucket.*drawSDF)(sdfShader);
     }
 
@@ -102,7 +105,7 @@ void Painter::renderSDF(SymbolBucket &bucket,
 
         sdfShader.u_buffer = (256.0f - 64.0f) / 256.0f;
 
-        depthRange(strata + strata_epsilon, 1.0f);
+        config.depthRange = { strata + strata_epsilon, 1.0f };
         (bucket.*drawSDF)(sdfShader);
     }
 }
@@ -116,8 +119,9 @@ void Painter::renderSymbol(SymbolBucket &bucket, const StyleLayer &layer_desc, c
     const auto &properties = layer_desc.getProperties<SymbolProperties>();
     const auto &layout = bucket.layout;
 
-    MBGL_CHECK_ERROR(glDisable(GL_STENCIL_TEST));
-    depthMask(false);
+    config.stencilTest = false;
+    config.depthTest = true;
+    config.depthMask = GL_FALSE;
 
     if (bucket.hasIconData()) {
         bool sdf = bucket.sdfIcons;
@@ -170,7 +174,7 @@ void Painter::renderSymbol(SymbolBucket &bucket, const StyleLayer &layer_desc, c
             iconShader->u_fadezoom = state.getNormalizedZoom() * 10;
             iconShader->u_opacity = properties.icon.opacity;
 
-            depthRange(strata, 1.0f);
+            config.depthRange = { strata, 1.0f };
             bucket.drawIcons(*iconShader);
         }
     }
@@ -190,7 +194,7 @@ void Painter::renderSymbol(SymbolBucket &bucket, const StyleLayer &layer_desc, c
     }
 
     if (bucket.hasCollisionBoxData()) {
-        MBGL_CHECK_ERROR(glEnable(GL_STENCIL_TEST));
+        config.stencilTest = true;
 
         useProgram(collisionBoxShader->program);
         collisionBoxShader->u_matrix = matrix;
@@ -199,10 +203,9 @@ void Painter::renderSymbol(SymbolBucket &bucket, const StyleLayer &layer_desc, c
         collisionBoxShader->u_maxzoom = (id.z + 1) * 10;
         lineWidth(3.0f);
 
-        depthRange(strata, 1.0f);
+        config.depthRange = { strata, 1.0f };
         bucket.drawCollisionBoxes(*collisionBoxShader);
 
     }
 
-    MBGL_CHECK_ERROR(glEnable(GL_STENCIL_TEST));
 }
diff --git a/src/mbgl/renderer/raster_bucket.cpp b/src/mbgl/renderer/raster_bucket.cpp
index b00933d24..7ee64baaf 100644
--- a/src/mbgl/renderer/raster_bucket.cpp
+++ b/src/mbgl/renderer/raster_bucket.cpp
@@ -1,6 +1,11 @@
 #include <mbgl/renderer/raster_bucket.hpp>
+#include <mbgl/shader/raster_shader.hpp>
 #include <mbgl/renderer/painter.hpp>
 
+#ifndef BUFFER_OFFSET
+#define BUFFER_OFFSET(i) ((char *)nullptr + (i))
+#endif
+
 using namespace mbgl;
 
 RasterBucket::RasterBucket(TexturePool& texturePool, const StyleLayoutRaster& layout_)
@@ -8,8 +13,17 @@ RasterBucket::RasterBucket(TexturePool& texturePool, const StyleLayoutRaster& la
   raster(texturePool) {
 }
 
-void RasterBucket::render(Painter &painter, const StyleLayer &layer_desc, const TileID &id,
-                          const mat4 &matrix) {
+void RasterBucket::upload() {
+    if (hasData()) {
+        raster.upload();
+        uploaded = true;
+    }
+}
+
+void RasterBucket::render(Painter& painter,
+                          const StyleLayer& layer_desc,
+                          const TileID& id,
+                          const mat4& matrix) {
     painter.renderRaster(*this, layer_desc, id, matrix);
 }
 
@@ -24,13 +38,6 @@ void RasterBucket::drawRaster(RasterShader& shader, StaticVertexBuffer &vertices
     MBGL_CHECK_ERROR(glDrawArrays(GL_TRIANGLES, 0, (GLsizei)vertices.index()));
 }
 
-void RasterBucket::drawRaster(RasterShader& shader, StaticVertexBuffer &vertices, VertexArrayObject &array, GLuint texture_) {
-    raster.bind(texture_);
-    shader.u_image = 0;
-    array.bind(shader, vertices, BUFFER_OFFSET(0));
-    MBGL_CHECK_ERROR(glDrawArrays(GL_TRIANGLES, 0, (GLsizei)vertices.index()));
-}
-
 bool RasterBucket::hasData() const {
     return raster.isLoaded();
 }
diff --git a/src/mbgl/renderer/raster_bucket.hpp b/src/mbgl/renderer/raster_bucket.hpp
index 22a151cf7..70434b7d6 100644
--- a/src/mbgl/renderer/raster_bucket.hpp
+++ b/src/mbgl/renderer/raster_bucket.hpp
@@ -5,8 +5,6 @@
 #include <mbgl/util/raster.hpp>
 #include <mbgl/style/style_bucket.hpp>
 
-
-
 namespace mbgl {
 
 class StyleLayoutRaster;
@@ -18,9 +16,9 @@ class RasterBucket : public Bucket {
 public:
     RasterBucket(TexturePool&, const StyleLayoutRaster&);
 
-    void render(Painter &painter, const StyleLayer &layer_desc, const TileID &id,
-                const mat4 &matrix) override;
-    bool hasData() const override;
+    void upload() override;
+    void render(Painter&, const StyleLayer&, const TileID&, const mat4&) override;
+    bool hasData() const;
 
     bool setImage(const std::string &data);
 
@@ -28,8 +26,6 @@ public:
 
     void drawRaster(RasterShader& shader, StaticVertexBuffer &vertices, VertexArrayObject &array);
 
-    void drawRaster(RasterShader& shader, StaticVertexBuffer &vertices, VertexArrayObject &array, GLuint texture);
-
     Raster raster;
 };
 
diff --git a/src/mbgl/renderer/render_pass.hpp b/src/mbgl/renderer/render_pass.hpp
new file mode 100644
index 000000000..a298b8b57
--- /dev/null
+++ b/src/mbgl/renderer/render_pass.hpp
@@ -0,0 +1,31 @@
+#ifndef MBGL_RENDERER_RENDER_PASS
+#define MBGL_RENDERER_RENDER_PASS
+
+#include <cstdint>
+#include <type_traits>
+
+namespace mbgl {
+
+enum class RenderPass : uint8_t {
+    None = 0,
+    Opaque = 1 << 0,
+    Translucent = 1 << 1,
+};
+
+constexpr inline RenderPass operator|(RenderPass a, RenderPass b) {
+    return static_cast<RenderPass>(static_cast<std::underlying_type<RenderPass>::type>(a) |
+                                   static_cast<std::underlying_type<RenderPass>::type>(b));
+}
+
+inline RenderPass operator|=(RenderPass& a, RenderPass b) {
+    return (a = a | b);
+}
+
+constexpr inline RenderPass operator&(RenderPass a, RenderPass b) {
+    return static_cast<RenderPass>(static_cast<std::underlying_type<RenderPass>::type>(a) &
+                                   static_cast<std::underlying_type<RenderPass>::type>(b));
+}
+
+}
+
+#endif
diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp
index 26a140db2..a14f9a7a4 100644
--- a/src/mbgl/renderer/symbol_bucket.cpp
+++ b/src/mbgl/renderer/symbol_bucket.cpp
@@ -11,6 +11,9 @@
 #include <mbgl/text/glyph_store.hpp>
 #include <mbgl/platform/log.hpp>
 #include <mbgl/text/collision_tile.hpp>
+#include <mbgl/shader/sdf_shader.hpp>
+#include <mbgl/shader/icon_shader.hpp>
+#include <mbgl/shader/box_shader.hpp>
 #include <mbgl/map/sprite.hpp>
 
 #include <mbgl/util/utf.hpp>
@@ -20,6 +23,10 @@
 #include <mbgl/util/clip_lines.hpp>
 #include <mbgl/util/std.hpp>
 
+#ifndef BUFFER_OFFSET
+#define BUFFER_OFFSET(i) ((char *)nullptr + (i))
+#endif
+
 namespace mbgl {
 
 SymbolInstance::SymbolInstance(Anchor &anchor, const std::vector<Coordinate> &line,
@@ -54,8 +61,23 @@ SymbolBucket::~SymbolBucket() {
     // Do not remove. header file only contains forward definitions to unique pointers.
 }
 
-void SymbolBucket::render(Painter &painter, const StyleLayer &layer_desc, const TileID &id,
-                          const mat4 &matrix) {
+void SymbolBucket::upload() {
+    if (hasTextData()) {
+        text.vertices.upload();
+        text.triangles.upload();
+    }
+    if (hasIconData()) {
+        icon.vertices.upload();
+        icon.triangles.upload();
+    }
+
+    uploaded = true;
+}
+
+void SymbolBucket::render(Painter& painter,
+                          const StyleLayer& layer_desc,
+                          const TileID& id,
+                          const mat4& matrix) {
     painter.renderSymbol(*this, layer_desc, id, matrix);
 }
 
@@ -67,17 +89,15 @@ bool SymbolBucket::hasIconData() const { return !icon.groups.empty(); }
 
 bool SymbolBucket::hasCollisionBoxData() const { return !collisionBox.groups.empty(); }
 
-std::vector<SymbolFeature> SymbolBucket::processFeatures(const GeometryTileLayer& layer,
-                                                         const FilterExpression& filter,
-                                                         GlyphStore &glyphStore,
-                                                         const Sprite &sprite) {
+bool SymbolBucket::needsDependencies(const GeometryTileLayer& layer,
+                                     const FilterExpression& filter,
+                                     GlyphStore& glyphStore,
+                                     Sprite& sprite) {
     const bool has_text = !layout.text.field.empty() && !layout.text.font.empty();
     const bool has_icon = !layout.icon.image.empty();
 
-    std::vector<SymbolFeature> features;
-
     if (!has_text && !has_icon) {
-        return features;
+        return false;
     }
 
     // Determine and load glyph ranges
@@ -140,21 +160,22 @@ std::vector<SymbolFeature> SymbolBucket::processFeatures(const GeometryTileLayer
         util::mergeLines(features);
     }
 
-    glyphStore.waitForGlyphRanges(layout.text.font, ranges);
-    sprite.waitUntilLoaded();
+    if (glyphStore.requestGlyphRangesIfNeeded(layout.text.font, ranges)) {
+        return true;
+    }
 
-    return features;
+    if (!sprite.isLoaded()) {
+        return true;
+    }
+
+    return false;
 }
 
-void SymbolBucket::addFeatures(const GeometryTileLayer& layer,
-                               const FilterExpression& filter,
-                               uintptr_t tileUID,
+void SymbolBucket::addFeatures(uintptr_t tileUID,
                                SpriteAtlas& spriteAtlas,
                                Sprite& sprite,
                                GlyphAtlas& glyphAtlas,
                                GlyphStore& glyphStore) {
-    const std::vector<SymbolFeature> features = processFeatures(layer, filter, glyphStore, sprite);
-
     float horizontalAlign = 0.5;
     float verticalAlign = 0.5;
 
@@ -196,7 +217,7 @@ void SymbolBucket::addFeatures(const GeometryTileLayer& layer,
         layout.text.justify == TextJustifyType::Left ? 0 :
         0.5;
 
-    const auto &fontStack = glyphStore.getFontStack(layout.text.font);
+    auto* fontStack = glyphStore.getFontStack(layout.text.font);
 
     for (const auto& feature : features) {
         if (!feature.geometry.size()) continue;
@@ -220,13 +241,12 @@ void SymbolBucket::addFeatures(const GeometryTileLayer& layer,
 
             // Add the glyphs we need for this label to the glyph atlas.
             if (shapedText) {
-                glyphAtlas.addGlyphs(tileUID, feature.label, layout.text.font, fontStack, face);
+                glyphAtlas.addGlyphs(tileUID, feature.label, layout.text.font, *fontStack, face);
             }
         }
 
         // if feature has icon, get sprite atlas position
         if (feature.sprite.length()) {
-            sprite.waitUntilLoaded();
             Rect<uint16_t> image = spriteAtlas.getImage(feature.sprite, false);
             shapedIcon = shapeIcon(image, layout);
 
@@ -241,6 +261,8 @@ void SymbolBucket::addFeatures(const GeometryTileLayer& layer,
         }
     }
 
+    features.clear();
+
     placeFeatures();
 }
 
diff --git a/src/mbgl/renderer/symbol_bucket.hpp b/src/mbgl/renderer/symbol_bucket.hpp
index b6ad24f1c..fb696b03b 100644
--- a/src/mbgl/renderer/symbol_bucket.hpp
+++ b/src/mbgl/renderer/symbol_bucket.hpp
@@ -65,16 +65,14 @@ public:
     SymbolBucket(CollisionTile &collision);
     ~SymbolBucket() override;
 
-    void render(Painter &painter, const StyleLayer &layer_desc, const TileID &id,
-                const mat4 &matrix) override;
-    bool hasData() const override;
+    void upload() override;
+    void render(Painter&, const StyleLayer&, const TileID&, const mat4&) override;
+    bool hasData() const;
     bool hasTextData() const;
     bool hasIconData() const;
     bool hasCollisionBoxData() const;
 
-    void addFeatures(const GeometryTileLayer&,
-                     const FilterExpression&,
-                     uintptr_t tileUID,
+    void addFeatures(uintptr_t tileUID,
                      SpriteAtlas&,
                      Sprite&,
                      GlyphAtlas&,
@@ -85,11 +83,12 @@ public:
     void drawIcons(IconShader& shader);
     void drawCollisionBoxes(CollisionBoxShader& shader);
 
+    bool needsDependencies(const GeometryTileLayer&,
+                           const FilterExpression&,
+                           GlyphStore&,
+                           Sprite&);
+
 private:
-    std::vector<SymbolFeature> processFeatures(const GeometryTileLayer&,
-                                               const FilterExpression&,
-                                               GlyphStore&,
-                                               const Sprite&);
     void addFeature(const std::vector<std::vector<Coordinate>> &lines,
             const Shaping &shapedText, const PositionedIcon &shapedIcon,
             const GlyphPositions &face);
@@ -108,6 +107,7 @@ public:
 private:
     CollisionTile &collision;
     std::vector<SymbolInstance> symbolInstances;
+    std::vector<SymbolFeature> features;
 
     struct TextBuffer {
         TextVertexBuffer vertices;
@@ -127,6 +127,7 @@ private:
     } collisionBox;
 
 };
+
 }
 
 #endif
diff --git a/src/mbgl/shader/uniform.hpp b/src/mbgl/shader/uniform.hpp
index 9a25d105c..d2a248c60 100644
--- a/src/mbgl/shader/uniform.hpp
+++ b/src/mbgl/shader/uniform.hpp
@@ -9,7 +9,7 @@ namespace mbgl {
 template <typename T>
 class Uniform {
 public:
-    Uniform(const GLchar* name, const Shader& shader) {
+    Uniform(const GLchar* name, const Shader& shader) : current() {
          location = MBGL_CHECK_ERROR(glGetUniformLocation(shader.program, name));
     }
 
@@ -32,7 +32,7 @@ class UniformMatrix {
 public:
     typedef std::array<float, C*R> T;
 
-    UniformMatrix(const GLchar* name, const Shader& shader) {
+    UniformMatrix(const GLchar* name, const Shader& shader) : current() {
         location = MBGL_CHECK_ERROR(glGetUniformLocation(shader.program, name));
     }
 
diff --git a/src/mbgl/storage/asset_context.hpp b/src/mbgl/storage/asset_context.hpp
new file mode 100644
index 000000000..44ebdba4f
--- /dev/null
+++ b/src/mbgl/storage/asset_context.hpp
@@ -0,0 +1,23 @@
+#ifndef MBGL_STORAGE_DEFAULT_ASSET_CONTEXT
+#define MBGL_STORAGE_DEFAULT_ASSET_CONTEXT
+
+#include <mbgl/storage/request_base.hpp>
+
+typedef struct uv_loop_s uv_loop_t;
+
+namespace mbgl {
+
+class AssetContext {
+public:
+    static std::unique_ptr<AssetContext> createContext(uv_loop_t*);
+
+    virtual ~AssetContext() = default;
+    virtual RequestBase* createRequest(const Resource&,
+                                       RequestBase::Callback,
+                                       uv_loop_t*,
+                                       const std::string& assetRoot) = 0;
+};
+
+}
+
+#endif
diff --git a/src/mbgl/storage/asset_request.hpp b/src/mbgl/storage/asset_request.hpp
deleted file mode 100644
index 48d421c3b..000000000
--- a/src/mbgl/storage/asset_request.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef MBGL_STORAGE_DEFAULT_ASSET_REQUEST
-#define MBGL_STORAGE_DEFAULT_ASSET_REQUEST
-
-#include "shared_request_base.hpp"
-
-namespace mbgl {
-
-class AssetRequest : public SharedRequestBase {
-public:
-    AssetRequest(DefaultFileSource::Impl *source, const Resource &resource);
-
-    void start(uv_loop_t *loop, std::shared_ptr<const Response> response = nullptr);
-    void cancel();
-
-private:
-    ~AssetRequest();
-    void *ptr = nullptr;
-
-    friend class AssetRequestImpl;
-};
-
-}
-
-#endif
diff --git a/src/mbgl/storage/default_file_source.cpp b/src/mbgl/storage/default_file_source.cpp
index 4055001fc..e8831f546 100644
--- a/src/mbgl/storage/default_file_source.cpp
+++ b/src/mbgl/storage/default_file_source.cpp
@@ -1,7 +1,7 @@
 #include <mbgl/storage/default_file_source_impl.hpp>
 #include <mbgl/storage/request.hpp>
-#include <mbgl/storage/asset_request.hpp>
-#include <mbgl/storage/http_request.hpp>
+#include <mbgl/storage/asset_context.hpp>
+#include <mbgl/storage/http_context.hpp>
 
 #include <mbgl/storage/response.hpp>
 #include <mbgl/platform/platform.hpp>
@@ -10,13 +10,11 @@
 #include <mbgl/util/chrono.hpp>
 #include <mbgl/util/thread.hpp>
 #include <mbgl/platform/log.hpp>
-#include <mbgl/map/environment.hpp>
 
 #pragma GCC diagnostic push
-#ifndef __clang__
-#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
 #pragma GCC diagnostic ignored "-Wshadow"
-#endif
+#pragma GCC diagnostic ignored "-Wunknown-pragmas"
+#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
 #include <boost/algorithm/string.hpp>
 #pragma GCC diagnostic pop
 
@@ -28,97 +26,122 @@ namespace algo = boost::algorithm;
 
 namespace mbgl {
 
-DefaultFileSource::Impl::Impl(FileCache* cache_, const std::string& root)
-    : assetRoot(root.empty() ? platform::assetRoot() : root), cache(cache_) {
-}
-
 DefaultFileSource::DefaultFileSource(FileCache* cache, const std::string& root)
-    : thread(util::make_unique<util::Thread<Impl>>("FileSource", cache, root)) {
+    : thread(util::make_unique<util::Thread<Impl>>("FileSource", util::ThreadPriority::Low, cache, root)) {
 }
 
 DefaultFileSource::~DefaultFileSource() {
     MBGL_VERIFY_THREAD(tid);
 }
 
-SharedRequestBase *DefaultFileSource::Impl::find(const Resource &resource) {
-    // We're using a set of pointers here instead of a map between url and SharedRequestBase because
-    // we need to find the requests both by pointer and by URL. Given that the number of requests
-    // is generally very small (typically < 10 at a time), hashing by URL incurs too much overhead
-    // anyway.
-    const auto it = pending.find(resource);
-    if (it != pending.end()) {
-        return it->second;
-    }
-    return nullptr;
-}
-
 Request* DefaultFileSource::request(const Resource& resource,
                                     uv_loop_t* l,
-                                    const Environment& env,
                                     Callback callback) {
-    auto req = new Request(resource, l, env, std::move(callback));
-
-    // This function can be called from any thread. Make sure we're executing the actual call in the
-    // file source loop by sending it over the queue.
-    thread->invoke(&Impl::add, std::move(req), thread->get());
-
+    assert(l);
+    auto req = new Request(resource, l, std::move(callback));
+    thread->invoke(&Impl::add, req);
     return req;
 }
 
-void DefaultFileSource::request(const Resource& resource, const Environment& env, Callback callback) {
-    request(resource, nullptr, env, std::move(callback));
-}
-
 void DefaultFileSource::cancel(Request *req) {
     req->cancel();
-
-    // This function can be called from any thread. Make sure we're executing the actual call in the
-    // file source loop by sending it over the queue.
-    thread->invoke(&Impl::cancel, std::move(req));
+    thread->invoke(&Impl::cancel, req);
 }
 
-void DefaultFileSource::abort(const Environment &env) {
-    thread->invoke(&Impl::abort, std::ref(env));
+// ----- Impl -----
+
+DefaultFileSource::Impl::Impl(uv_loop_t* loop_, FileCache* cache_, const std::string& root)
+    : loop(loop_),
+      cache(cache_),
+      assetRoot(root.empty() ? platform::assetRoot() : root),
+      assetContext(AssetContext::createContext(loop_)),
+      httpContext(HTTPContext::createContext(loop_)) {
 }
 
-void DefaultFileSource::Impl::add(Request* req, uv_loop_t* loop) {
-    const Resource &resource = req->resource;
-
-    // We're adding a new Request.
-    SharedRequestBase *sharedRequest = find(resource);
-    if (!sharedRequest) {
-        // There is no request for this URL yet. Create a new one and start it.
-        if (algo::starts_with(resource.url, "asset://")) {
-            sharedRequest = new AssetRequest(this, resource);
-        } else {
-            sharedRequest = new HTTPRequest(this, resource);
-        }
-
-        const bool inserted = pending.emplace(resource, sharedRequest).second;
-        assert(inserted);
-        (void (inserted)); // silence unused variable warning on Release builds.
-
-        // But first, we're going to start querying the database if it exists.
-        if (!cache) {
-            sharedRequest->start(loop);
-        } else {
-            // Otherwise, first check the cache for existing data so that we can potentially
-            // revalidate the information without having to redownload everything.
-            cache->get(resource, [this, resource, loop](std::unique_ptr<Response> response) {
-                processResult(resource, std::move(response), loop);
-            });
-        }
+DefaultFileRequest* DefaultFileSource::Impl::find(const Resource& resource) {
+    const auto it = pending.find(resource);
+    if (it != pending.end()) {
+        return &it->second;
+    }
+    return nullptr;
+}
+
+void DefaultFileSource::Impl::add(Request* req) {
+    const Resource& resource = req->resource;
+    DefaultFileRequest* request = find(resource);
+
+    if (request) {
+        request->observers.insert(req);
+        return;
+    }
+
+    request = &pending.emplace(resource, resource).first->second;
+    request->observers.insert(req);
+
+    if (cache) {
+        startCacheRequest(resource);
+    } else {
+        startRealRequest(resource);
+    }
+}
+
+void DefaultFileSource::Impl::startCacheRequest(const Resource& resource) {
+    // Check the cache for existing data so that we can potentially
+    // revalidate the information without having to redownload everything.
+    cache->get(resource, [this, resource](std::unique_ptr<Response> response) {
+        DefaultFileRequest* request = find(resource);
+
+        if (!request || request->request) {
+            // There is no request for this URL anymore. Likely, the request was canceled
+            // before we got around to process the cache result.
+            // The second possibility is that a request has already been started by another cache
+            // request. In this case, we don't have to do anything either.
+            return;
+        }
+
+        auto expired = [&response] {
+            const int64_t now = std::chrono::duration_cast<std::chrono::seconds>(
+                                    SystemClock::now().time_since_epoch()).count();
+            return response->expires <= now;
+        };
+
+        if (!response || expired()) {
+            // No response or stale cache. Run the real request.
+            startRealRequest(resource, std::move(response));
+        } else {
+            // The response is fresh. We're good to notify the caller.
+            notify(request, std::move(response), FileCache::Hint::No);
+        }
+    });
+}
+
+void DefaultFileSource::Impl::startRealRequest(const Resource& resource, std::shared_ptr<const Response> response) {
+    DefaultFileRequest* request = find(resource);
+
+    auto callback = [request, this] (std::shared_ptr<const Response> res, FileCache::Hint hint) {
+        notify(request, res, hint);
+    };
+
+    if (algo::starts_with(resource.url, "asset://")) {
+        request->request = assetContext->createRequest(resource, callback, loop, assetRoot);
+    } else {
+        request->request = httpContext->createRequest(resource, callback, loop, response);
     }
-    sharedRequest->subscribe(req);
 }
 
 void DefaultFileSource::Impl::cancel(Request* req) {
-    SharedRequestBase *sharedRequest = find(req->resource);
-    if (sharedRequest) {
-        // If the number of dependent requests of the SharedRequestBase drops to zero, the
-        // unsubscribe callback triggers the removal of the SharedRequestBase pointer from the list
-        // of pending requests and initiates cancelation.
-        sharedRequest->unsubscribe(req);
+    DefaultFileRequest* request = find(req->resource);
+
+    if (request) {
+        // If the number of dependent requests of the DefaultFileRequest drops to zero,
+        // cancel the request and remove it from the pending list.
+        request->observers.erase(req);
+        if (request->observers.empty()) {
+            if (request->request) {
+                request->request->cancel();
+            }
+            pending.erase(request->resource);
+        }
     } else {
         // There is no request for this URL anymore. Likely, the request already completed
         // before we got around to process the cancelation request.
@@ -129,78 +152,22 @@ void DefaultFileSource::Impl::cancel(Request* req) {
     req->destruct();
 }
 
-void DefaultFileSource::Impl::processResult(const Resource& resource, std::shared_ptr<const Response> response, uv_loop_t* loop) {
-    SharedRequestBase *sharedRequest = find(resource);
-    if (sharedRequest) {
-        if (response) {
-            // This entry was stored in the cache. Now determine if we need to revalidate.
-            const int64_t now = std::chrono::duration_cast<std::chrono::seconds>(
-                                    SystemClock::now().time_since_epoch()).count();
-            if (response->expires > now) {
-                // The response is fresh. We're good to notify the caller.
-                sharedRequest->notify(response, FileCache::Hint::No);
-                sharedRequest->cancel();
-                return;
-            } else {
-                // The cached response is stale. Now run the real request.
-                sharedRequest->start(loop, response);
-            }
-        } else {
-            // There is no response. Now run the real request.
-            sharedRequest->start(loop);
-        }
-    } else {
-        // There is no request for this URL anymore. Likely, the request was canceled
-        // before we got around to process the cache result.
-    }
-}
-
-// Aborts all requests that are part of the current environment.
-void DefaultFileSource::Impl::abort(const Environment& env) {
-    // Construct a cancellation response.
-    auto res = util::make_unique<Response>();
-    res->status = Response::Error;
-    res->message = "Environment is terminating";
-    std::shared_ptr<const Response> response = std::move(res);
-
-    // Iterate through all pending requests and remove them in case they're abandoned.
-    util::erase_if(pending, [&](const std::pair<Resource, SharedRequestBase *> &it) -> bool {
-        // Obtain all pending requests that are in the current environment.
-        const auto aborted = it.second->removeAllInEnvironment(env);
-
-        // Notify all observers.
-        for (auto req : aborted) {
-            req->notify(response);
-        }
-
-        // Finally, remove all requests that are now abandoned.
-        if (it.second->abandoned()) {
-            it.second->cancel();
-            return true;
-        } else {
-            return false;
-        }
-    });
-}
-
-void DefaultFileSource::Impl::notify(SharedRequestBase *sharedRequest,
-                               const std::set<Request *> &observers,
-                               std::shared_ptr<const Response> response, FileCache::Hint hint) {
+void DefaultFileSource::Impl::notify(DefaultFileRequest* request, std::shared_ptr<const Response> response, FileCache::Hint hint) {
     // First, remove the request, since it might be destructed at any point now.
-    assert(find(sharedRequest->resource) == sharedRequest);
-    pending.erase(sharedRequest->resource);
+    assert(find(request->resource) == request);
+    assert(response);
 
-    if (response) {
-        if (cache) {
-            // Store response in database
-            cache->put(sharedRequest->resource, response, hint);
-        }
-
-        // Notify all observers.
-        for (auto req : observers) {
-            req->notify(response);
-        }
+    // Notify all observers.
+    for (auto req : request->observers) {
+        req->notify(response);
     }
+
+    if (cache) {
+        // Store response in database
+        cache->put(request->resource, response, hint);
+    }
+
+    pending.erase(request->resource);
 }
 
 }
diff --git a/src/mbgl/storage/default_file_source_impl.hpp b/src/mbgl/storage/default_file_source_impl.hpp
index 97210dc44..3845014e9 100644
--- a/src/mbgl/storage/default_file_source_impl.hpp
+++ b/src/mbgl/storage/default_file_source_impl.hpp
@@ -2,33 +2,53 @@
 #define MBGL_STORAGE_DEFAULT_DEFAULT_FILE_SOURCE_IMPL
 
 #include <mbgl/storage/default_file_source.hpp>
+#include <mbgl/storage/asset_context.hpp>
+#include <mbgl/storage/http_context.hpp>
 
 #include <set>
 #include <unordered_map>
 
+typedef struct uv_loop_s uv_loop_t;
+
 namespace mbgl {
 
-class SharedRequestBase;
+class RequestBase;
+
+struct DefaultFileRequest {
+    const Resource resource;
+    std::set<Request*> observers;
+    RequestBase* request = nullptr;
+
+    inline DefaultFileRequest(const Resource& resource_)
+        : resource(resource_) {}
+
+    // Make it movable-only
+    DefaultFileRequest(const DefaultFileRequest&) = delete;
+    inline DefaultFileRequest(DefaultFileRequest&&) = default;
+    DefaultFileRequest& operator=(const DefaultFileRequest&) = delete;
+    inline DefaultFileRequest& operator=(DefaultFileRequest&&) = default;
+};
 
 class DefaultFileSource::Impl {
 public:
-    Impl(FileCache *cache, const std::string &root = "");
+    Impl(uv_loop_t*, FileCache*, const std::string& = "");
 
-    void notify(SharedRequestBase *sharedRequest, const std::set<Request *> &observers,
-                std::shared_ptr<const Response> response, FileCache::Hint hint);
-    SharedRequestBase *find(const Resource &resource);
-
-    void add(Request* request, uv_loop_t* loop);
-    void cancel(Request* request);
-    void abort(const Environment& env);
-
-    const std::string assetRoot;
+    void add(Request*);
+    void cancel(Request*);
 
 private:
-    void processResult(const Resource& resource, std::shared_ptr<const Response> response, uv_loop_t* loop);
+    DefaultFileRequest* find(const Resource&);
 
-    std::unordered_map<Resource, SharedRequestBase *, Resource::Hash> pending;
-    FileCache *cache = nullptr;
+    void startCacheRequest(const Resource&);
+    void startRealRequest(const Resource&, std::shared_ptr<const Response> = nullptr);
+    void notify(DefaultFileRequest*, std::shared_ptr<const Response>, FileCache::Hint);
+
+    std::unordered_map<Resource, DefaultFileRequest, Resource::Hash> pending;
+    uv_loop_t* loop = nullptr;
+    FileCache* cache = nullptr;
+    const std::string assetRoot;
+    std::unique_ptr<AssetContext> assetContext;
+    std::unique_ptr<HTTPContext> httpContext;
 };
 
 }
diff --git a/src/mbgl/storage/http_context.cpp b/src/mbgl/storage/http_context.cpp
new file mode 100644
index 000000000..c74749080
--- /dev/null
+++ b/src/mbgl/storage/http_context.cpp
@@ -0,0 +1,30 @@
+#include <mbgl/storage/http_context.hpp>
+
+namespace mbgl {
+
+HTTPContext::HTTPContext(uv_loop_t* loop_)
+    : reachability(loop_, [this] { retryRequests(); }) {
+    NetworkStatus::Subscribe(reachability.get());
+    reachability.unref();
+}
+
+HTTPContext::~HTTPContext() {
+    assert(requests.empty());
+    NetworkStatus::Unsubscribe(reachability.get());
+}
+
+void HTTPContext::addRequest(RequestBase* request) {
+    requests.insert(request);
+}
+
+void HTTPContext::removeRequest(RequestBase* request) {
+    requests.erase(request);
+}
+
+void HTTPContext::retryRequests() {
+    for (auto request : requests) {
+        request->retry();
+    }
+}
+
+}
diff --git a/src/mbgl/storage/http_context.hpp b/src/mbgl/storage/http_context.hpp
index 6b9518dab..64a8afa6d 100644
--- a/src/mbgl/storage/http_context.hpp
+++ b/src/mbgl/storage/http_context.hpp
@@ -1,76 +1,40 @@
 #ifndef MBGL_STORAGE_DEFAULT_HTTP_CONTEXT
 #define MBGL_STORAGE_DEFAULT_HTTP_CONTEXT
 
-#include "thread_context.hpp"
+#include <mbgl/storage/request_base.hpp>
 #include <mbgl/storage/network_status.hpp>
+#include <mbgl/util/uv_detail.hpp>
 
 #include <set>
 
 namespace mbgl {
 
-class HTTPRequest;
-
-// This is a template class that provides a per-thread Context object. It can be used by HTTP
-// implementations to store global state. It also implements the NetworkStatus mechanism and
-// triggers immediate retries on all requests waiting for network status changes.
-
-template <typename Context>
-class HTTPContext : public ThreadContext<Context> {
+class HTTPContext {
 public:
-    HTTPContext(uv_loop_t *loop);
-    ~HTTPContext();
+    static std::unique_ptr<HTTPContext> createContext(uv_loop_t*);
 
-    void addRequest(HTTPRequest *request);
-    void removeRequest(HTTPRequest *baton);
+    HTTPContext(uv_loop_t*);
+    virtual ~HTTPContext();
+
+    virtual RequestBase* createRequest(const Resource&,
+                                       RequestBase::Callback,
+                                       uv_loop_t*,
+                                       std::shared_ptr<const Response>) = 0;
+
+    void addRequest(RequestBase*);
+    void removeRequest(RequestBase*);
+
+private:
+    void retryRequests();
 
-public:
     // Will be fired when the network status becomes reachable.
-    uv_async_t *reachability = nullptr;
+    uv::async reachability;
 
     // A list of all pending HTTPRequestImpls that we need to notify when the network status
     // changes.
-    std::set<HTTPRequest *> requests;
+    std::set<RequestBase*> requests;
 };
 
-template <typename Context>
-HTTPContext<Context>::HTTPContext(uv_loop_t *loop_)
-    : ThreadContext<Context>(loop_) {
-    reachability = new uv_async_t;
-    reachability->data = this;
-#if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10
-    uv_async_init(loop_, reachability, [](uv_async_t *async, int) {
-#else
-    uv_async_init(loop_, reachability, [](uv_async_t *async) {
-#endif
-        for (auto request : reinterpret_cast<Context *>(async->data)->requests) {
-            request->retryImmediately();
-        }
-    });
-    // Allow the loop to quit even though this handle is still active.
-    uv_unref(reinterpret_cast<uv_handle_t *>(reachability));
-    NetworkStatus::Subscribe(reachability);
-}
-
-template <typename Context>
-HTTPContext<Context>::~HTTPContext() {
-    MBGL_VERIFY_THREAD(HTTPContext<Context>::tid);
-
-    assert(requests.empty());
-
-    NetworkStatus::Unsubscribe(reachability);
-    uv::close(reachability);
-}
-
-template <typename Context>
-void HTTPContext<Context>::addRequest(HTTPRequest *request) {
-    requests.insert(request);
-}
-
-template <typename Context>
-void HTTPContext<Context>::removeRequest(HTTPRequest *request) {
-    requests.erase(request);
-}
-
 }
 
 #endif
diff --git a/src/mbgl/storage/http_request.hpp b/src/mbgl/storage/http_request.hpp
deleted file mode 100644
index 54e9a77ef..000000000
--- a/src/mbgl/storage/http_request.hpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef MBGL_STORAGE_DEFAULT_HTTP_REQUEST
-#define MBGL_STORAGE_DEFAULT_HTTP_REQUEST
-
-#include "shared_request_base.hpp"
-
-namespace mbgl {
-
-class HTTPRequest : public SharedRequestBase {
-public:
-    HTTPRequest(DefaultFileSource::Impl *source, const Resource &resource);
-
-    void start(uv_loop_t *loop, std::shared_ptr<const Response> response = nullptr);
-    void cancel();
-
-    void retryImmediately();
-
-private:
-    ~HTTPRequest();
-    void *ptr = nullptr;
-
-    friend class HTTPRequestImpl;
-};
-
-}
-
-#endif
diff --git a/src/mbgl/storage/request.cpp b/src/mbgl/storage/request.cpp
index ea80e5950..a6d845ce4 100644
--- a/src/mbgl/storage/request.cpp
+++ b/src/mbgl/storage/request.cpp
@@ -1,12 +1,11 @@
 #include <mbgl/storage/request.hpp>
 
+#include <mbgl/map/environment.hpp>
 #include <mbgl/storage/response.hpp>
 
 #include <mbgl/util/util.hpp>
 #include <mbgl/util/std.hpp>
-#include <mbgl/util/uv.hpp>
-
-#include <uv.h>
+#include <mbgl/util/uv_detail.hpp>
 
 #include <cassert>
 #include <functional>
@@ -16,24 +15,14 @@ namespace mbgl {
 struct Request::Canceled { std::mutex mutex; bool confirmed = false; };
 
 // Note: This requires that loop is running in the current thread (or not yet running).
-Request::Request(const Resource &resource_, uv_loop_t *loop, const Environment &env_, Callback callback_)
-    : callback(callback_), resource(resource_), env(env_) {
-    // When there is no loop supplied (== nullptr), the callback will be fired in an arbitrary
-    // thread (the thread notify() is called from) rather than kicking back to the calling thread.
-    if (loop) {
-        async = new uv_async_t;
-        async->data = this;
-#if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10
-        uv_async_init(loop, async, [](uv_async_t *a, int) { reinterpret_cast<Request *>(a->data)->notifyCallback(); });
-#else
-        uv_async_init(loop, async, [](uv_async_t *a) { reinterpret_cast<Request *>(a->data)->notifyCallback(); });
-#endif
-    }
+Request::Request(const Resource &resource_, uv_loop_t *loop, Callback callback_)
+    : async(util::make_unique<uv::async>(loop, [this] { notifyCallback(); })),
+      callback(callback_),
+      resource(resource_) {
 }
 
 // Called in the originating thread.
 void Request::notifyCallback() {
-    MBGL_VERIFY_THREAD(tid)
     if (!canceled) {
         invoke();
     } else {
@@ -59,32 +48,18 @@ void Request::invoke() {
     delete this;
 }
 
-Request::~Request() {
-    if (async) {
-        uv_close(reinterpret_cast<uv_handle_t*>(async), [](uv_handle_t* handle) {
-            delete reinterpret_cast<uv_async_t*>(handle);
-        });
-    }
-}
+Request::~Request() = default;
 
 // Called in the FileSource thread.
 void Request::notify(const std::shared_ptr<const Response> &response_) {
     assert(!response);
     response = response_;
     assert(response);
-
-    if (async) {
-        uv_async_send(async);
-    } else {
-        // This request is not cancelable. This means that the callback will be executed in an
-        // arbitrary thread (== FileSource thread).
-        invoke();
-    }
+    async->send();
 }
 
 // Called in the originating thread.
 void Request::cancel() {
-    MBGL_VERIFY_THREAD(tid)
     assert(async);
     assert(!canceled);
     canceled = util::make_unique<Canceled>();
@@ -98,7 +73,7 @@ void Request::destruct() {
     assert(canceled);
     std::unique_lock<std::mutex> lock(canceled->mutex);
     canceled->confirmed = true;
-    uv_async_send(async);
+    async->send();
     // after this method returns, the FileSource thread has no knowledge of
     // this object anymore.
 }
diff --git a/src/mbgl/storage/request_base.hpp b/src/mbgl/storage/request_base.hpp
new file mode 100644
index 000000000..c8dfad477
--- /dev/null
+++ b/src/mbgl/storage/request_base.hpp
@@ -0,0 +1,35 @@
+#ifndef MBGL_STORAGE_REQUEST
+#define MBGL_STORAGE_REQUEST
+
+#include <mbgl/util/noncopyable.hpp>
+#include <mbgl/storage/file_cache.hpp>
+#include <mbgl/storage/resource.hpp>
+
+#include <memory>
+#include <functional>
+
+namespace mbgl {
+
+class Response;
+
+class RequestBase : private util::noncopyable {
+public:
+    using Callback = std::function<void (std::shared_ptr<const Response> response, FileCache::Hint hint)>;
+
+    RequestBase(const Resource& resource_, Callback notify_)
+        : resource(resource_)
+        , notify(notify_) {
+    }
+
+    virtual ~RequestBase() = default;
+    virtual void cancel() = 0;
+    virtual void retry() {};
+
+protected:
+    Resource resource;
+    Callback notify;
+};
+
+}
+
+#endif
diff --git a/src/mbgl/storage/shared_request_base.hpp b/src/mbgl/storage/shared_request_base.hpp
deleted file mode 100644
index d7ed00264..000000000
--- a/src/mbgl/storage/shared_request_base.hpp
+++ /dev/null
@@ -1,106 +0,0 @@
-#ifndef MBGL_STORAGE_DEFAULT_SHARED_REQUEST_BASE
-#define MBGL_STORAGE_DEFAULT_SHARED_REQUEST_BASE
-
-#include <mbgl/storage/resource.hpp>
-#include <mbgl/storage/file_cache.hpp>
-#include <mbgl/storage/default_file_source_impl.hpp>
-#include <mbgl/storage/request.hpp>
-#include <mbgl/util/util.hpp>
-#include <mbgl/util/noncopyable.hpp>
-
-#include <string>
-#include <set>
-#include <vector>
-#include <cassert>
-
-typedef struct uv_loop_s uv_loop_t;
-
-namespace mbgl {
-
-class Request;
-class Response;
-class DefaultFileSource;
-
-class SharedRequestBase : private util::noncopyable {
-protected:
-    MBGL_STORE_THREAD(tid)
-
-public:
-    SharedRequestBase(DefaultFileSource::Impl *source_, const Resource &resource_)
-        : resource(resource_), source(source_) {}
-
-    virtual void start(uv_loop_t *loop, std::shared_ptr<const Response> response = nullptr) = 0;
-    virtual void cancel() = 0;
-
-    void notify(std::shared_ptr<const Response> response, FileCache::Hint hint) {
-        MBGL_VERIFY_THREAD(tid);
-
-        if (source) {
-            source->notify(this, observers, response, hint);
-        }
-    }
-
-    void subscribe(Request *request) {
-        MBGL_VERIFY_THREAD(tid);
-
-        observers.insert(request);
-    }
-
-    void unsubscribe(Request *request) {
-        MBGL_VERIFY_THREAD(tid);
-
-        observers.erase(request);
-
-        if (abandoned()) {
-            // There are no observers anymore. We are initiating cancelation.
-            if (source) {
-                // First, remove this SharedRequestBase from the source.
-                source->notify(this, observers, nullptr, FileCache::Hint::No);
-            }
-
-            // Then, initiate cancelation of this request
-            cancel();
-        }
-    }
-
-    bool abandoned() const {
-        return observers.empty();
-    }
-
-    std::vector<Request *> removeAllInEnvironment(const Environment &env) {
-        MBGL_VERIFY_THREAD(tid);
-
-        std::vector<Request *> result;
-
-        // Removes all Requests in the supplied environment and returns a list
-        // of them.
-        util::erase_if(observers, [&](Request *req) -> bool {
-            if (&req->env == &env) {
-                result.push_back(req);
-                return true;
-            } else {
-                return false;
-            }
-        });
-
-        return result;
-    }
-
-protected:
-    virtual ~SharedRequestBase() {
-        MBGL_VERIFY_THREAD(tid);
-    }
-
-public:
-    const Resource resource;
-
-protected:
-    DefaultFileSource::Impl *source = nullptr;
-
-private:
-    std::set<Request *> observers;
-};
-
-}
-
-#endif
diff --git a/src/mbgl/storage/thread_context.hpp b/src/mbgl/storage/thread_context.hpp
deleted file mode 100644
index 763c83a25..000000000
--- a/src/mbgl/storage/thread_context.hpp
+++ /dev/null
@@ -1,78 +0,0 @@
-#ifndef MBGL_STORAGE_DEFAULT_THREAD_CONTEXT
-#define MBGL_STORAGE_DEFAULT_THREAD_CONTEXT
-
-#include <mbgl/util/noncopyable.hpp>
-#include <mbgl/util/std.hpp>
-#include <mbgl/util/util.hpp>
-#include <mbgl/util/uv.hpp>
-
-#include <uv.h>
-#include <pthread.h>
-
-#include <map>
-#include <cassert>
-
-namespace mbgl {
-
-// This is a template class that provides a per-thread and per-loop Context object. It can be used
-// by implementations to store global state.
-
-template <typename Context>
-class ThreadContext : private util::noncopyable {
-protected:
-    MBGL_STORE_THREAD(tid)
-    using Map = std::map<uv_loop_t *, std::unique_ptr<Context>>;
-
-public:
-    static Context *Get(uv_loop_t *loop);
-
-private:
-    static pthread_key_t key;
-    static pthread_once_t once;
-
-public:
-    ThreadContext(uv_loop_t *loop);
-    ~ThreadContext();
-
-public:
-    uv_loop_t *loop;
-};
-
-template <typename Context>
-Context *ThreadContext<Context>::Get(uv_loop_t *loop) {
-    pthread_once(&once, []() {
-        pthread_key_create(&key, [](void *ptr) {
-            assert(ptr);
-            delete reinterpret_cast<Map *>(ptr);
-        });
-    });
-    auto contexts = reinterpret_cast<Map *>(pthread_getspecific(key));
-    if (!contexts) {
-        contexts = new Map();
-        pthread_setspecific(key, contexts);
-    }
-
-    // Now find a ThreadContext that matches the requested loop.
-    auto it = contexts->find(loop);
-    if (it == contexts->end()) {
-        auto result = contexts->emplace(loop, util::make_unique<Context>(loop));
-        assert(result.second); // Make sure it was actually inserted.
-        return result.first->second.get();
-    } else {
-        return it->second.get();
-    }
-}
-
-template <typename Context>
-ThreadContext<Context>::ThreadContext(uv_loop_t *loop_) : loop(loop_) {
-}
-
-template <typename Context>
-ThreadContext<Context>::~ThreadContext() {
-    MBGL_VERIFY_THREAD(tid);
-}
-
-
-}
-
-#endif
diff --git a/src/mbgl/style/filter_expression.cpp b/src/mbgl/style/filter_expression.cpp
index 684715b02..bb755c564 100644
--- a/src/mbgl/style/filter_expression.cpp
+++ b/src/mbgl/style/filter_expression.cpp
@@ -59,7 +59,11 @@ FilterExpression parseSetFilter(const rapidjson::Value& value) {
     Expression expression;
     expression.key = { value[1u].GetString(), value[1u].GetStringLength() };
     for (rapidjson::SizeType i = 2; i < value.Size(); ++i) {
-        expression.values.push_back(parseValue(value[i]));
+        Value parsedValue = parseValue(value[i]);
+        if (expression.key == "$type") {
+            parsedValue = parseFeatureType(parsedValue);
+        }
+        expression.values.push_back(parsedValue);
     }
     return expression;
 }
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index 0a2a53075..51d92fdca 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -17,7 +17,8 @@
 namespace mbgl {
 
 Style::Style()
-    : mtx(util::make_unique<uv::rwlock>()) {
+    : mtx(util::make_unique<uv::rwlock>()),
+      workers(4) {
 }
 
 // Note: This constructor is seemingly empty, but we need to declare it anyway
@@ -84,6 +85,27 @@ void Style::loadJSON(const uint8_t *const data) {
     layers = parser.getLayers();
     sprite_url = parser.getSprite();
     glyph_url = parser.getGlyphURL();
+    loaded = true;
+}
+
+bool Style::isLoaded() const {
+    // TODO: move loading into Style
+    if (!loaded) {
+        return false;
+    }
+
+    for (const auto& source : sources) {
+        if (!source->isLoaded()) {
+            return false;
+        }
+    }
+
+    // TODO: move sprite into Style
+//    if (sprite && !sprite.isLoaded()) {
+//        return false;
+//    }
+
+    return true;
 }
 
 }
diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp
index dde21173f..42d7b0b9a 100644
--- a/src/mbgl/style/style.hpp
+++ b/src/mbgl/style/style.hpp
@@ -8,6 +8,7 @@
 #include <mbgl/util/ptr.hpp>
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/chrono.hpp>
+#include <mbgl/util/worker.hpp>
 
 #include <cstdint>
 #include <string>
@@ -24,6 +25,7 @@ public:
     ~Style();
 
     void loadJSON(const uint8_t *const data);
+    bool isLoaded() const;
 
     void cascade(const std::vector<std::string>&);
     void recalculate(float z, TimePoint now);
@@ -39,10 +41,14 @@ public:
     std::string base;
 
 private:
+    bool loaded = false;
     std::string sprite_url;
     PropertyTransition defaultTransition;
     std::unique_ptr<uv::rwlock> mtx;
     ZoomHistory zoomHistory;
+
+public:
+    Worker workers;
 };
 
 }
diff --git a/src/mbgl/style/style_layer.cpp b/src/mbgl/style/style_layer.cpp
index e9c301d8c..8713b73b1 100644
--- a/src/mbgl/style/style_layer.cpp
+++ b/src/mbgl/style/style_layer.cpp
@@ -13,6 +13,21 @@ bool StyleLayer::isBackground() const {
     return type == StyleLayerType::Background;
 }
 
+bool StyleLayer::isVisible() const {
+    switch (type) {
+        case StyleLayerType::Fill:
+            return getProperties<FillProperties>().isVisible();
+        case StyleLayerType::Line:
+            return getProperties<LineProperties>().isVisible();
+        case StyleLayerType::Symbol:
+            return getProperties<SymbolProperties>().isVisible();
+        case StyleLayerType::Raster:
+            return getProperties<RasterProperties>().isVisible();
+        default:
+            return false;
+    }
+}
+
 void StyleLayer::setClasses(const std::vector<std::string> &class_names, const TimePoint now,
                             const PropertyTransition &defaultTransition) {
     // Stores all keys that we have already added transitions for.
diff --git a/src/mbgl/style/style_layer.hpp b/src/mbgl/style/style_layer.hpp
index a00b7084f..774ed3901 100644
--- a/src/mbgl/style/style_layer.hpp
+++ b/src/mbgl/style/style_layer.hpp
@@ -35,6 +35,9 @@ public:
     // Determines whether this layer is the background layer.
     bool isBackground() const;
 
+    // Checks whether the layer is currently visible at all.
+    bool isVisible() const;
+
     // Updates the StyleProperties information in this layer by evaluating all
     // pending transitions and applied classes in order.
     void updateProperties(float z, TimePoint now, ZoomHistory &zoomHistory);
diff --git a/src/mbgl/style/style_parser.cpp b/src/mbgl/style/style_parser.cpp
index dc91c250c..313fe3df8 100644
--- a/src/mbgl/style/style_parser.cpp
+++ b/src/mbgl/style/style_parser.cpp
@@ -10,9 +10,9 @@
 #include <csscolorparser/csscolorparser.hpp>
 
 #pragma GCC diagnostic push
-#ifndef __clang__
+#pragma GCC diagnostic ignored "-Wshadow"
+#pragma GCC diagnostic ignored "-Wunknown-pragmas"
 #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
-#endif
 #include <boost/algorithm/string.hpp>
 #pragma GCC diagnostic pop
 
diff --git a/src/mbgl/text/glyph.hpp b/src/mbgl/text/glyph.hpp
index bc46042d2..03016f0fb 100644
--- a/src/mbgl/text/glyph.hpp
+++ b/src/mbgl/text/glyph.hpp
@@ -35,7 +35,7 @@ struct Glyph {
         : rect(rect_), metrics(metrics_) {}
 
     operator bool() const {
-        return metrics || rect;
+        return metrics || rect.hasArea();
     }
 
     const Rect<uint16_t> rect;
diff --git a/src/mbgl/text/glyph_store.cpp b/src/mbgl/text/glyph_store.cpp
index 55159f313..37e26b193 100644
--- a/src/mbgl/text/glyph_store.cpp
+++ b/src/mbgl/text/glyph_store.cpp
@@ -9,7 +9,9 @@
 #include <mbgl/util/constants.hpp>
 #include <mbgl/util/token.hpp>
 #include <mbgl/util/math.hpp>
+#include <mbgl/util/uv_detail.hpp>
 #include <mbgl/storage/file_source.hpp>
+#include <mbgl/platform/log.hpp>
 #include <mbgl/platform/platform.hpp>
 #include <mbgl/util/uv_detail.hpp>
 #include <algorithm>
@@ -155,11 +157,12 @@ void FontStack::lineWrap(Shaping &shaping, const float lineHeight, const float m
      shaping.right = shaping.left + maxLineLength;
 }
 
-GlyphPBF::GlyphPBF(const std::string &glyphURL,
-                   const std::string &fontStack,
+GlyphPBF::GlyphPBF(const std::string& glyphURL,
+                   const std::string& fontStack,
                    GlyphRange glyphRange,
-                   Environment &env)
-    : future(promise.get_future().share()) {
+                   Environment& env_,
+                   const GlyphLoadedCallback& callback)
+    : parsed(false), env(env_) {
     // Load the glyph set URL
     std::string url = util::replaceTokens(glyphURL, [&](const std::string &name) -> std::string {
         if (name == "fontstack") return util::percentEncode(fontStack);
@@ -168,25 +171,29 @@ GlyphPBF::GlyphPBF(const std::string &glyphURL,
     });
 
     // The prepare call jumps back to the main thread.
-    env.requestAsync({ Resource::Kind::Glyphs, url }, [&, url](const Response &res) {
+    req = env.request({ Resource::Kind::Glyphs, url }, [&, url, callback](const Response &res) {
+        req = nullptr;
+
         if (res.status != Response::Successful) {
-            // Something went wrong with loading the glyph pbf. Pass on the error to the future listeners.
-            const std::string msg = std::string { "[ERROR] failed to load glyphs: " } + res.message;
-            promise.set_exception(std::make_exception_ptr(std::runtime_error(msg)));
+            // Something went wrong with loading the glyph pbf.
+            const std::string msg = std::string { "[ERROR] failed to load glyphs: " } + url + " message: " + res.message;
+            Log::Error(Event::HttpRequest, msg);
         } else {
             // Transfer the data to the GlyphSet and signal its availability.
             // Once it is available, the caller will need to call parse() to actually
             // parse the data we received. We are not doing this here since this callback is being
             // called from another (unknown) thread.
             data = res.data;
-            promise.set_value(*this);
+            parsed = true;
+            callback(this);
         }
     });
 }
 
-
-std::shared_future<GlyphPBF &> GlyphPBF::getFuture() {
-    return future;
+GlyphPBF::~GlyphPBF() {
+    if (req) {
+        env.cancelRequest(req);
+    }
 }
 
 void GlyphPBF::parse(FontStack &stack) {
@@ -243,68 +250,88 @@ void GlyphPBF::parse(FontStack &stack) {
     data.clear();
 }
 
-GlyphStore::GlyphStore(Environment& env_) : env(env_), mtx(util::make_unique<uv::mutex>()) {}
+bool GlyphPBF::isParsed() const {
+    return parsed;
+}
+
+GlyphStore::GlyphStore(uv_loop_t* loop, Environment& env_)
+    : env(env_),
+      asyncEmitGlyphRangeLoaded(util::make_unique<uv::async>(loop, [this] { emitGlyphRangeLoaded(); })),
+      observer(nullptr) {
+    asyncEmitGlyphRangeLoaded->unref();
+}
+
+GlyphStore::~GlyphStore() {
+    observer = nullptr;
+}
 
 void GlyphStore::setURL(const std::string &url) {
     glyphURL = url;
 }
 
+bool GlyphStore::requestGlyphRangesIfNeeded(const std::string& fontStack,
+                                            const std::set<GlyphRange>& glyphRanges) {
+    bool requestIsNeeded = false;
 
-void GlyphStore::waitForGlyphRanges(const std::string &fontStack, const std::set<GlyphRange> &glyphRanges) {
-    // We are implementing a blocking wait with futures: Every GlyphSet has a future that we are
-    // waiting for until it is loaded.
     if (glyphRanges.empty()) {
-        return;
+        return requestIsNeeded;
     }
 
-    uv::exclusive<FontStack> stack(mtx);
+    auto callback = [this, fontStack](GlyphPBF* glyph) {
+        glyph->parse(*createFontStack(fontStack));
+        asyncEmitGlyphRangeLoaded->send();
+    };
 
-    std::vector<std::shared_future<GlyphPBF &>> futures;
-    futures.reserve(glyphRanges.size());
-    {
-        auto &rangeSets = ranges[fontStack];
+    std::lock_guard<std::mutex> lock(rangesMutex);
+    auto& rangeSets = ranges[fontStack];
 
-        stack << createFontStack(fontStack);
+    for (const auto& range : glyphRanges) {
+        const auto& rangeSets_it = rangeSets.find(range);
+        if (rangeSets_it == rangeSets.end()) {
+            auto glyph = util::make_unique<GlyphPBF>(glyphURL, fontStack, range, env, callback);
+            rangeSets.emplace(range, std::move(glyph));
+            requestIsNeeded = true;
+            continue;
+        }
 
-        // Attempt to load the glyph range. If the GlyphSet already exists, we are getting back
-        // the same shared_future.
-        for (const auto range : glyphRanges) {
-            futures.emplace_back(loadGlyphRange(fontStack, rangeSets, range));
+        if (!rangeSets_it->second->isParsed()) {
+            requestIsNeeded = true;
         }
     }
 
-    // Now that we potentially created all GlyphSets, we are waiting for the results, one by one.
-    // When we get a result (or the GlyphSet is aready loaded), we are attempting to parse the
-    // GlyphSet.
-    for (const auto& future : futures) {
-        future.get().parse(stack);
-    }
+    return requestIsNeeded;
 }
 
-std::shared_future<GlyphPBF &> GlyphStore::loadGlyphRange(const std::string &fontStack, std::map<GlyphRange, std::unique_ptr<GlyphPBF>> &rangeSets, const GlyphRange range) {
-    auto range_it = rangeSets.find(range);
-    if (range_it == rangeSets.end()) {
-        // We don't have this glyph set yet for this font stack.
-        range_it = rangeSets.emplace(range, util::make_unique<GlyphPBF>(glyphURL, fontStack, range, env)).first;
-    }
+FontStack* GlyphStore::createFontStack(const std::string &fontStack) {
+    std::lock_guard<std::mutex> lock(stacksMutex);
 
-    return range_it->second->getFuture();
-}
-
-FontStack &GlyphStore::createFontStack(const std::string &fontStack) {
     auto stack_it = stacks.find(fontStack);
     if (stack_it == stacks.end()) {
         stack_it = stacks.emplace(fontStack, util::make_unique<FontStack>()).first;
     }
 
-    return *stack_it->second.get();
+    return stack_it->second.get();
 }
 
-uv::exclusive<FontStack> GlyphStore::getFontStack(const std::string &fontStack) {
-    uv::exclusive<FontStack> stack(mtx);
-    stack << createFontStack(fontStack);
-    return stack;
+FontStack* GlyphStore::getFontStack(const std::string &fontStack) {
+    std::lock_guard<std::mutex> lock(stacksMutex);
+
+    const auto& stack_it = stacks.find(fontStack);
+    if (stack_it == stacks.end()) {
+        return nullptr;
+    }
+
+    return stack_it->second.get();
 }
 
+void GlyphStore::setObserver(Observer* observer_) {
+    observer = observer_;
+}
+
+void GlyphStore::emitGlyphRangeLoaded() {
+    if (observer) {
+        observer->onGlyphRangeLoaded();
+    }
+}
 
 }
diff --git a/src/mbgl/text/glyph_store.hpp b/src/mbgl/text/glyph_store.hpp
index ee2097536..efa848dd0 100644
--- a/src/mbgl/text/glyph_store.hpp
+++ b/src/mbgl/text/glyph_store.hpp
@@ -4,19 +4,28 @@
 #include <mbgl/text/glyph.hpp>
 #include <mbgl/util/vec.hpp>
 #include <mbgl/util/ptr.hpp>
-#include <mbgl/util/uv.hpp>
 
 #include <cstdint>
 #include <vector>
 #include <future>
 #include <map>
 #include <set>
+#include <string>
 #include <unordered_map>
 
+typedef struct uv_loop_s uv_loop_t;
+
+namespace uv {
+
+class async;
+
+}
+
 namespace mbgl {
 
 class FileSource;
 class Environment;
+class Request;
 
 class SDFGlyph {
 public:
@@ -49,10 +58,17 @@ private:
 
 class GlyphPBF {
 public:
+    using GlyphLoadedCallback = std::function<void(GlyphPBF*)>;
+
     GlyphPBF(const std::string &glyphURL,
              const std::string &fontStack,
              GlyphRange glyphRange,
-             Environment &env);
+             Environment &env,
+             const GlyphLoadedCallback& callback);
+    ~GlyphPBF();
+
+    void parse(FontStack &stack);
+    bool isParsed() const;
 
 private:
     GlyphPBF(const GlyphPBF &) = delete;
@@ -60,43 +76,58 @@ private:
     GlyphPBF &operator=(const GlyphPBF &) = delete;
     GlyphPBF &operator=(GlyphPBF &&) = delete;
 
-public:
-    void parse(FontStack &stack);
-
-    std::shared_future<GlyphPBF &> getFuture();
-
-private:
     std::string data;
-    std::promise<GlyphPBF &> promise;
-    std::shared_future<GlyphPBF &> future;
-    std::mutex mtx;
+    std::atomic_bool parsed;
+
+    Environment& env;
+    Request* req = nullptr;
+
+    mutable std::mutex mtx;
 };
 
 // Manages Glyphrange PBF loading.
 class GlyphStore {
 public:
-    GlyphStore(Environment &);
+    class Observer {
+    public:
+        virtual ~Observer() = default;
 
-    // Block until all specified GlyphRanges of the specified font stack are loaded.
-    void waitForGlyphRanges(const std::string &fontStack, const std::set<GlyphRange> &glyphRanges);
+        virtual void onGlyphRangeLoaded() = 0;
+    };
 
-    uv::exclusive<FontStack> getFontStack(const std::string &fontStack);
+    GlyphStore(uv_loop_t* loop, Environment &);
+    ~GlyphStore();
+
+    // Asynchronously request for GlyphRanges and when it gets loaded, notifies the
+    // observer subscribed to this object. Successive requests for the same range are
+    // going to be discarded. Returns true if a request was made or false if all the
+    // GlyphRanges are already available, and thus, no request is performed.
+    bool requestGlyphRangesIfNeeded(const std::string &fontStack, const std::set<GlyphRange> &glyphRanges);
+
+    FontStack* getFontStack(const std::string &fontStack);
 
     void setURL(const std::string &url);
 
-private:
-    // Loads an individual glyph range from the font stack and adds it to rangeSets
-    std::shared_future<GlyphPBF &> loadGlyphRange(const std::string &fontStack, std::map<GlyphRange, std::unique_ptr<GlyphPBF>> &rangeSets, GlyphRange range);
+    void setObserver(Observer* observer);
 
-    FontStack &createFontStack(const std::string &fontStack);
+private:
+    void emitGlyphRangeLoaded();
+
+    FontStack* createFontStack(const std::string &fontStack);
 
     std::string glyphURL;
     Environment &env;
-    std::unordered_map<std::string, std::map<GlyphRange, std::unique_ptr<GlyphPBF>>> ranges;
-    std::unordered_map<std::string, std::unique_ptr<FontStack>> stacks;
-    std::unique_ptr<uv::mutex> mtx;
-};
 
+    std::unordered_map<std::string, std::map<GlyphRange, std::unique_ptr<GlyphPBF>>> ranges;
+    std::mutex rangesMutex;
+
+    std::unordered_map<std::string, std::unique_ptr<FontStack>> stacks;
+    std::mutex stacksMutex;
+
+    std::unique_ptr<uv::async> asyncEmitGlyphRangeLoaded;
+
+    Observer* observer;
+};
 
 }
 
diff --git a/src/mbgl/text/quads.cpp b/src/mbgl/text/quads.cpp
index a30269035..6c517bab2 100644
--- a/src/mbgl/text/quads.cpp
+++ b/src/mbgl/text/quads.cpp
@@ -136,7 +136,7 @@ SymbolQuads getGlyphQuads(Anchor &anchor, const Shaping &shapedText,
         if (!glyph)
             continue;
 
-        if (!rect)
+        if (!rect.hasArea())
             continue;
 
         const float centerX = (positionedGlyph.x + glyph.metrics.advance / 2.0f) * boxScale;
diff --git a/src/mbgl/text/shaping.hpp b/src/mbgl/text/shaping.hpp
index 41e889333..c409e6ed0 100644
--- a/src/mbgl/text/shaping.hpp
+++ b/src/mbgl/text/shaping.hpp
@@ -19,7 +19,7 @@ namespace mbgl {
             float left = 0;
             float right = 0;
 
-            operator bool() const { return image; }
+            operator bool() const { return image.hasArea(); }
     };
 
     class StyleLayoutSymbol;
diff --git a/src/mbgl/util/clip_id.cpp b/src/mbgl/util/clip_id.cpp
index be359c18c..c475369c2 100644
--- a/src/mbgl/util/clip_id.cpp
+++ b/src/mbgl/util/clip_id.cpp
@@ -75,14 +75,14 @@ void ClipIDGenerator::update(std::forward_list<Tile *> tiles) {
 
     if (pool.size()) {
         const uint32_t bit_count = util::ceil_log2(pool.size() + 1);
-        const std::bitset<8> mask = uint64_t(((1 << bit_count) - 1) << bit_offset);
+        const std::bitset<8> mask = uint64_t(((1ul << bit_count) - 1) << bit_offset);
 
         // We are starting our count with 1 since we need at least 1 bit set to distinguish between
         // areas without any tiles whatsoever and the current area.
         uint8_t count = 1;
         for (auto& leaf : pool) {
             leaf.tile.clip.mask = mask;
-            leaf.tile.clip.reference = count++ << bit_offset;
+            leaf.tile.clip.reference = uint32_t(count++) << bit_offset;
         }
 
         bit_offset += bit_count;
diff --git a/src/mbgl/util/mat4.cpp b/src/mbgl/util/mat4.cpp
index 50270d921..cabd8e284 100644
--- a/src/mbgl/util/mat4.cpp
+++ b/src/mbgl/util/mat4.cpp
@@ -87,7 +87,7 @@ void matrix::copy(mat4& out, const mat4& a) {
 }
 
 void matrix::translate(mat4& out, const mat4& a, float x, float y, float z) {
-    if (a == out) {
+    if (&a == &out) {
         out[12] = a[0] * x + a[4] * y + a[8] * z + a[12];
         out[13] = a[1] * x + a[5] * y + a[9] * z + a[13];
         out[14] = a[2] * x + a[6] * y + a[10] * z + a[14];
@@ -124,7 +124,7 @@ void matrix::rotate_z(mat4& out, const mat4& a, float rad) {
           a12 = a[6],
           a13 = a[7];
 
-    if (a != out) { // If the source and destination differ, copy the unchanged last row
+    if (&a != &out) { // If the source and destination differ, copy the unchanged last row
         out[8]  = a[8];
         out[9]  = a[9];
         out[10] = a[10];
diff --git a/src/mbgl/util/raster.cpp b/src/mbgl/util/raster.cpp
index d0e305c33..f2171a616 100644
--- a/src/mbgl/util/raster.cpp
+++ b/src/mbgl/util/raster.cpp
@@ -46,16 +46,7 @@ void Raster::bind(bool linear) {
     }
 
     if (img && !textured) {
-        texture = texturePool.getTextureID();
-        MBGL_CHECK_ERROR(glBindTexture(GL_TEXTURE_2D, texture));
-#ifndef GL_ES_VERSION_2_0
-        MBGL_CHECK_ERROR(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0));
-#endif
-        MBGL_CHECK_ERROR(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE));
-        MBGL_CHECK_ERROR(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE));
-        MBGL_CHECK_ERROR(glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, img->getData()));
-        img.reset();
-        textured = true;
+        upload();
     } else if (textured) {
         MBGL_CHECK_ERROR(glBindTexture(GL_TEXTURE_2D, texture));
     }
@@ -68,24 +59,17 @@ void Raster::bind(bool linear) {
     }
 }
 
-// overload ::bind for prerendered raster textures
-void Raster::bind(const GLuint custom_texture) {
+void Raster::upload() {
     if (img && !textured) {
-        MBGL_CHECK_ERROR(glBindTexture(GL_TEXTURE_2D, custom_texture));
+        texture = texturePool.getTextureID();
+        MBGL_CHECK_ERROR(glBindTexture(GL_TEXTURE_2D, texture));
+#ifndef GL_ES_VERSION_2_0
+        MBGL_CHECK_ERROR(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0));
+#endif
         MBGL_CHECK_ERROR(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE));
         MBGL_CHECK_ERROR(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE));
         MBGL_CHECK_ERROR(glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, img->getData()));
         img.reset();
         textured = true;
-    } else if (textured) {
-        MBGL_CHECK_ERROR(glBindTexture(GL_TEXTURE_2D, custom_texture));
     }
-
-    GLuint new_filter = GL_LINEAR;
-    if (new_filter != this->filter) {
-        MBGL_CHECK_ERROR(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, new_filter));
-        MBGL_CHECK_ERROR(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, new_filter));
-        filter = new_filter;
-    }
-
 }
diff --git a/src/mbgl/util/raster.hpp b/src/mbgl/util/raster.hpp
index f19ff7178..1789ae87f 100644
--- a/src/mbgl/util/raster.hpp
+++ b/src/mbgl/util/raster.hpp
@@ -25,8 +25,8 @@ public:
     // bind current texture
     void bind(bool linear = false);
 
-    // bind prerendered texture
-    void bind(const GLuint texture);
+    // uploads the texture if it hasn't been uploaded yet.
+    void upload();
 
     // loaded status
     bool isLoaded() const;
diff --git a/src/mbgl/util/rect.hpp b/src/mbgl/util/rect.hpp
index 5cc398d82..f4eb0679c 100644
--- a/src/mbgl/util/rect.hpp
+++ b/src/mbgl/util/rect.hpp
@@ -12,11 +12,16 @@ struct Rect {
     T originalW = 0, originalH = 0;
 
     template <typename Number>
-    Rect operator *(Number value) const {
+    inline Rect operator *(Number value) const {
         return Rect(x * value, y * value, w * value, h * value);
     }
 
-    operator bool() const { return w != 0 && h != 0; }
+    template <typename R>
+    inline bool operator==(const R& r) const {
+        return x == r.x && y == r.y && w == r.w && h == r.h;
+    }
+
+    inline bool hasArea() const { return w != 0 && h != 0; }
 };
 }
 
diff --git a/src/mbgl/util/run_loop.cpp b/src/mbgl/util/run_loop.cpp
index fd9ad4306..7f277c988 100644
--- a/src/mbgl/util/run_loop.cpp
+++ b/src/mbgl/util/run_loop.cpp
@@ -5,8 +5,13 @@ namespace util {
 
 uv::tls<RunLoop> RunLoop::current;
 
-RunLoop::RunLoop()
-    : async(*loop, std::bind(&RunLoop::process, this)) {
+RunLoop::RunLoop(uv_loop_t* loop)
+    : async(loop, std::bind(&RunLoop::process, this)) {
+    current.set(this);
+}
+
+RunLoop::~RunLoop() {
+    current.set(nullptr);
 }
 
 void RunLoop::withMutex(std::function<void()>&& fn) {
@@ -24,13 +29,6 @@ void RunLoop::process() {
     }
 }
 
-void RunLoop::run() {
-    assert(!current.get());
-    current.set(this);
-    loop.run();
-    current.set(nullptr);
-}
-
 void RunLoop::stop() {
     invoke([&] { async.unref(); });
 }
diff --git a/src/mbgl/util/run_loop.hpp b/src/mbgl/util/run_loop.hpp
index d785854e7..ed2b364ce 100644
--- a/src/mbgl/util/run_loop.hpp
+++ b/src/mbgl/util/run_loop.hpp
@@ -14,9 +14,9 @@ namespace util {
 
 class RunLoop : private util::noncopyable {
 public:
-    RunLoop();
+    RunLoop(uv_loop_t*);
+    ~RunLoop();
 
-    void run();
     void stop();
 
     // Invoke fn() in the runloop thread.
@@ -29,29 +29,32 @@ public:
 
     // Invoke fn() in the runloop thread, then invoke callback(result) in the current thread.
     template <class Fn, class R>
-    void invokeWithResult(Fn&& fn, std::function<void (R)> callback) {
+    void invokeWithResult(Fn&& fn, std::function<void (R)>&& callback) {
         RunLoop* outer = current.get();
         assert(outer);
 
-        invoke([fn, callback, outer] {
-            /*
-                With C++14, we could write:
-
-                outer->invoke([callback, result = std::move(fn())] () mutable {
-                    callback(std::move(result));
-                });
-
-                Instead we're using a workaround with std::bind
-                to obtain move-capturing semantics with C++11:
-                  http://stackoverflow.com/a/12744730/52207
-            */
-            outer->invoke(std::bind([callback] (R& result) {
+        invoke([fn = std::move(fn), callback = std::move(callback), outer] () mutable {
+            outer->invoke([callback = std::move(callback), result = std::move(fn())] () mutable {
                 callback(std::move(result));
-            }, std::move(fn())));
+            });
         });
     }
 
-    uv_loop_t* get() { return *loop; }
+    // Invoke fn() in the runloop thread, then invoke callback() in the current thread.
+    template <class Fn>
+    void invokeWithResult(Fn&& fn, std::function<void ()>&& callback) {
+        RunLoop* outer = current.get();
+        assert(outer);
+
+        invoke([fn = std::move(fn), callback = std::move(callback), outer] () mutable {
+            fn();
+            outer->invoke(std::move(callback));
+        });
+    }
+
+    uv_loop_t* get() { return async.get()->loop; }
+
+    static uv::tls<RunLoop> current;
 
 private:
     // A movable type-erasing invokable entity wrapper. This allows to store arbitrary invokable
@@ -71,15 +74,11 @@ private:
 
     using Queue = std::queue<std::unique_ptr<Message>>;
 
-    static uv::tls<RunLoop> current;
-
     void withMutex(std::function<void()>&&);
     void process();
 
     Queue queue;
     std::mutex mutex;
-
-    uv::loop loop;
     uv::async async;
 };
 
diff --git a/src/mbgl/util/thread.hpp b/src/mbgl/util/thread.hpp
index 4831b9efc..a2ad95864 100644
--- a/src/mbgl/util/thread.hpp
+++ b/src/mbgl/util/thread.hpp
@@ -3,9 +3,11 @@
 
 #include <future>
 #include <thread>
+#include <atomic>
 #include <functional>
 
 #include <mbgl/util/run_loop.hpp>
+#include <mbgl/platform/platform.hpp>
 
 namespace {
 
@@ -33,11 +35,16 @@ namespace util {
 // Thread<> constructor blocks until the thread and the Object are fully created, so after the
 // object creation, it's safe to obtain the Object stored in this thread.
 
+enum class ThreadPriority : bool {
+    Regular,
+    Low,
+};
+
 template <class Object>
 class Thread {
 public:
     template <class... Args>
-    Thread(const std::string& name, Args&&... args);
+    Thread(const std::string& name, ThreadPriority priority, Args&&... args);
     ~Thread();
 
     // Invoke object->fn(args...) in the runloop thread.
@@ -48,11 +55,33 @@ public:
 
     // Invoke object->fn(args...) in the runloop thread, then invoke callback(result) in the current thread.
     template <typename Fn, class R, class... Args>
-    void invokeWithResult(Fn fn, std::function<void (R)> callback, Args&&... args) {
-        loop->invokeWithResult(std::bind(fn, object, args...), callback);
+    void invokeWithResult(Fn fn, std::function<void (R)>&& callback, Args&&... args) {
+        loop->invokeWithResult(std::bind(fn, object, std::move(args)...), std::move(callback));
     }
 
-    uv_loop_t* get() { return loop->get(); }
+    // Invoke object->fn(args...) in the runloop thread, then invoke callback() in the current thread.
+    template <typename Fn, class... Args>
+    void invokeWithResult(Fn fn, std::function<void ()>&& callback, Args&&... args) {
+        loop->invokeWithResult(std::bind(fn, object, std::move(args)...), std::move(callback));
+    }
+
+    // Invoke object->fn(args...) in the runloop thread, and wait for the result.
+    template <class R, typename Fn, class... Args>
+    R invokeSync(Fn fn, Args&&... args) {
+        std::packaged_task<R ()> task(std::bind(fn, object, args...));
+        std::future<R> future = task.get_future();
+        loop->invoke(std::move(task));
+        return future.get();
+    }
+
+    // Invoke object->fn(args...) in the runloop thread, and wait for it to complete.
+    template <typename Fn, class... Args>
+    void invokeSync(Fn fn, Args&&... args) {
+        std::packaged_task<void ()> task(std::bind(fn, object, args...));
+        std::future<void> future = task.get_future();
+        loop->invoke(std::move(task));
+        return future.get();
+    }
 
 private:
     Thread(const Thread&) = delete;
@@ -74,7 +103,7 @@ private:
 
 template <class Object>
 template <class... Args>
-Thread<Object>::Thread(const std::string& name, Args&&... args) {
+Thread<Object>::Thread(const std::string& name, ThreadPriority priority, Args&&... args) {
     // Note: We're using std::tuple<> to store the arguments because GCC 4.9 has a bug
     // when expanding parameters packs captured in lambdas.
     std::tuple<Args...> params = std::forward_as_tuple(::std::forward<Args>(args)...);
@@ -86,6 +115,10 @@ Thread<Object>::Thread(const std::string& name, Args&&... args) {
         (void(name));
         #endif
 
+        if (priority == ThreadPriority::Low) {
+            platform::makeThreadLowPriority();
+        }
+
         constexpr auto seq = typename integer_sequence<sizeof...(Args)>::type();
         run(std::move(params), seq);
     });
@@ -96,14 +129,24 @@ Thread<Object>::Thread(const std::string& name, Args&&... args) {
 template <class Object>
 template <typename P, std::size_t... I>
 void Thread<Object>::run(P&& params, index_sequence<I...>) {
-    Object object_(std::get<I>(std::forward<P>(params))...);
-    object = &object_;
+    uv::loop l;
 
-    RunLoop loop_;
-    loop = &loop_;
+    {
+        RunLoop loop_(l.get());
+        loop = &loop_;
 
-    running.set_value();
-    loop_.run();
+        Object object_(l.get(), std::get<I>(std::forward<P>(params))...);
+        object = &object_;
+
+        running.set_value();
+        l.run();
+
+        loop = nullptr;
+        object = nullptr;
+    }
+
+    // Run the loop again to ensure that async close callbacks have been called.
+    l.run();
 
     joinable.get_future().get();
 }
diff --git a/src/mbgl/util/uv.cpp b/src/mbgl/util/uv.cpp
index 5dae34ebd..d76e42f67 100644
--- a/src/mbgl/util/uv.cpp
+++ b/src/mbgl/util/uv.cpp
@@ -1,8 +1,29 @@
 #include <mbgl/util/uv.hpp>
 #include <mbgl/util/uv_detail.hpp>
+#include <mbgl/util/string.hpp>
 
 #include <uv.h>
 
+// Check libuv library version.
+const static bool uvVersionCheck = []() {
+    const unsigned int version = uv_version();
+    const unsigned int major = (version >> 16) & 0xFF;
+    const unsigned int minor = (version >> 8) & 0xFF;
+    const unsigned int patch = version & 0xFF;
+
+#ifndef UV_VERSION_PATCH
+    // 0.10 doesn't have UV_VERSION_PATCH defined, so we "fake" it by using the library patch level.
+    const unsigned int UV_VERSION_PATCH = version & 0xFF;
+#endif
+
+    if (major != UV_VERSION_MAJOR || minor != UV_VERSION_MINOR || patch != UV_VERSION_PATCH) {
+        throw std::runtime_error(mbgl::util::sprintf<96>(
+            "libuv version mismatch: headers report %d.%d.%d, but library reports %d.%d.%d", UV_VERSION_MAJOR,
+            UV_VERSION_MINOR, UV_VERSION_PATCH, major, minor, patch));
+    }
+    return true;
+}();
+
 #if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10
 
 int uv_key_create(uv_key_t* key) {
diff --git a/src/mbgl/util/uv_detail.hpp b/src/mbgl/util/uv_detail.hpp
index 96d544246..7e2c16a2a 100644
--- a/src/mbgl/util/uv_detail.hpp
+++ b/src/mbgl/util/uv_detail.hpp
@@ -28,13 +28,6 @@ UV_EXTERN void uv_key_set(uv_key_t* key, void* value);
 
 namespace uv {
 
-template <class T>
-void close(std::unique_ptr<T> ptr) {
-    uv_close(reinterpret_cast<uv_handle_t*>(ptr.release()), [](uv_handle_t* handle) {
-        delete reinterpret_cast<T*>(handle);
-    });
-}
-
 class loop : public mbgl::util::noncopyable {
 public:
     inline loop() {
@@ -74,36 +67,50 @@ private:
     uv_loop_t *l = nullptr;
 };
 
-class async : public mbgl::util::noncopyable {
+template <class T>
+class handle : public mbgl::util::noncopyable {
+public:
+    inline handle() : t(reinterpret_cast<uv_handle_t*>(new T)) {
+        t->data = this;
+    }
+
+    inline ~handle() {
+        uv_close(t.release(), [](uv_handle_t* h) {
+            delete reinterpret_cast<T*>(h);
+        });
+    }
+
+    inline void ref() {
+        uv_ref(t.get());
+    }
+
+    inline void unref() {
+        uv_unref(t.get());
+    }
+
+    inline T* get() {
+        return reinterpret_cast<T*>(t.get());
+    }
+
+private:
+    std::unique_ptr<uv_handle_t> t;
+};
+
+class async : public handle<uv_async_t> {
 public:
     inline async(uv_loop_t* loop, std::function<void ()> fn_)
-        : a(new uv_async_t)
-        , fn(fn_)
-    {
-        a->data = this;
-        if (uv_async_init(loop, a.get(), async_cb) != 0) {
+        : fn(fn_) {
+        if (uv_async_init(loop, get(), async_cb) != 0) {
             throw std::runtime_error("failed to initialize async");
         }
     }
 
-    inline ~async() {
-        close(std::move(a));
-    }
-
     inline void send() {
-        if (uv_async_send(a.get()) != 0) {
+        if (uv_async_send(get()) != 0) {
             throw std::runtime_error("failed to async send");
         }
     }
 
-    inline void ref() {
-        uv_ref(reinterpret_cast<uv_handle_t*>(a.get()));
-    }
-
-    inline void unref() {
-        uv_unref(reinterpret_cast<uv_handle_t*>(a.get()));
-    }
-
 private:
 #if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10
     static void async_cb(uv_async_t* a, int) {
@@ -113,7 +120,40 @@ private:
         reinterpret_cast<async*>(a->data)->fn();
     }
 
-    std::unique_ptr<uv_async_t> a;
+    std::function<void ()> fn;
+};
+
+class timer : public handle<uv_timer_t> {
+public:
+    inline timer(uv_loop_t* loop) {
+        if (uv_timer_init(loop, get()) != 0) {
+            throw std::runtime_error("failed to initialize timer");
+        }
+    }
+
+    inline void start(uint64_t timeout, uint64_t repeat, std::function<void ()> fn_) {
+        fn = fn_;
+        if (uv_timer_start(get(), timer_cb, timeout, repeat) != 0) {
+            throw std::runtime_error("failed to start timer");
+        }
+    }
+
+    inline void stop() {
+        fn = nullptr;
+        if (uv_timer_stop(get()) != 0) {
+            throw std::runtime_error("failed to stop timer");
+        }
+    }
+
+private:
+#if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10
+    static void timer_cb(uv_timer_t* t, int) {
+#else
+    static void timer_cb(uv_timer_t* t) {
+#endif
+        reinterpret_cast<timer*>(t->data)->fn();
+    }
+
     std::function<void ()> fn;
 };
 
diff --git a/src/mbgl/util/work_request.cpp b/src/mbgl/util/work_request.cpp
new file mode 100644
index 000000000..69e939728
--- /dev/null
+++ b/src/mbgl/util/work_request.cpp
@@ -0,0 +1,16 @@
+#include <mbgl/util/work_request.hpp>
+#include <mbgl/util/work_task.hpp>
+
+#include <cassert>
+
+namespace mbgl {
+
+WorkRequest::WorkRequest(Task task_) : task(task_) {
+    assert(task);
+}
+
+WorkRequest::~WorkRequest() {
+    task->cancel();
+}
+
+}
diff --git a/src/mbgl/util/work_request.hpp b/src/mbgl/util/work_request.hpp
new file mode 100644
index 000000000..f2aa2bbac
--- /dev/null
+++ b/src/mbgl/util/work_request.hpp
@@ -0,0 +1,24 @@
+#ifndef MBGL_UTIL_WORK_REQUEST
+#define MBGL_UTIL_WORK_REQUEST
+
+#include <mbgl/util/noncopyable.hpp>
+
+#include <memory>
+
+namespace mbgl {
+
+class WorkTask;
+
+class WorkRequest : public util::noncopyable {
+public:
+    using Task = std::shared_ptr<WorkTask>;
+    WorkRequest(Task);
+    ~WorkRequest();
+
+private:
+    std::shared_ptr<WorkTask> task;
+};
+
+}
+
+#endif
diff --git a/src/mbgl/util/work_task.cpp b/src/mbgl/util/work_task.cpp
new file mode 100644
index 000000000..ebec420de
--- /dev/null
+++ b/src/mbgl/util/work_task.cpp
@@ -0,0 +1,37 @@
+#include <mbgl/util/work_task.hpp>
+
+#include <cassert>
+
+namespace mbgl {
+
+WorkTask::WorkTask(std::function<void()> task_, std::function<void()> after_)
+    : task(task_), after(after_) {
+    assert(after);
+}
+
+void WorkTask::runTask() {
+    // We are only running the task when there's an after callback to call. This means that an
+    // empty after callback will be treated as a cancelled request. The mutex will be locked while
+    // processing so that the cancel() callback will block.
+    std::lock_guard<std::mutex> lock(mutex);
+    if (after) {
+        task();
+    }
+}
+
+void WorkTask::runAfter() {
+    if (after) {
+        after();
+    }
+}
+
+void WorkTask::cancel() {
+    // Remove the after callback to indicate that this callback has been canceled. The mutex will
+    // block when the task is currently in progres. When the task has not begun yet, the runTask()
+    // method will not do anything. When the task has been completed already, and the after callback
+    // was run as well, this will also do nothing.
+    std::lock_guard<std::mutex> lock(mutex);
+    after = {};
+}
+
+} // end namespace mbgl
diff --git a/src/mbgl/util/work_task.hpp b/src/mbgl/util/work_task.hpp
new file mode 100644
index 000000000..f730a31c5
--- /dev/null
+++ b/src/mbgl/util/work_task.hpp
@@ -0,0 +1,27 @@
+#ifndef MBGL_UTIL_WORK_TASK
+#define MBGL_UTIL_WORK_TASK
+
+#include <mbgl/util/noncopyable.hpp>
+
+#include <functional>
+#include <mutex>
+
+namespace mbgl {
+
+class WorkTask : private util::noncopyable {
+public:
+    WorkTask(std::function<void()> task, std::function<void()> after);
+
+    void runTask();
+    void runAfter();
+    void cancel();
+
+private:
+    const std::function<void()> task;
+    std::function<void()> after;
+    std::mutex mutex;
+};
+
+} // end namespace mbgl
+
+#endif
diff --git a/src/mbgl/util/worker.cpp b/src/mbgl/util/worker.cpp
index 3559cdd71..984c55c95 100644
--- a/src/mbgl/util/worker.cpp
+++ b/src/mbgl/util/worker.cpp
@@ -1,73 +1,40 @@
 #include <mbgl/util/worker.hpp>
+#include <mbgl/util/work_task.hpp>
+#include <mbgl/util/work_request.hpp>
+#include <mbgl/platform/platform.hpp>
 
 #include <cassert>
+#include <future>
 
 namespace mbgl {
 
-Worker::Worker(uv_loop_t* loop, std::size_t count)
-    : queue(new Queue(loop, [this](Fn after) { afterWork(after); }))
-{
-    queue->unref();
+class Worker::Impl {
+public:
+    Impl(uv_loop_t*) {}
 
+    void doWork(std::shared_ptr<WorkTask>& task) {
+        task->runTask();
+    }
+};
+
+Worker::Worker(std::size_t count) {
     for (std::size_t i = 0; i < count; i++) {
-        threads.emplace_back(&Worker::workLoop, this);
+        threads.emplace_back(util::make_unique<util::Thread<Impl>>("Worker", util::ThreadPriority::Low));
     }
 }
 
-Worker::~Worker() {
-    MBGL_VERIFY_THREAD(tid);
+Worker::~Worker() = default;
 
-    if (active++ == 0) {
-        queue->ref();
-    }
+std::unique_ptr<WorkRequest> Worker::send(Fn work, Fn after) {
+    auto task = std::make_shared<WorkTask>(work, after);
+    auto request = util::make_unique<WorkRequest>(task);
 
-    channel.send(Work());
+    threads[current]->invokeWithResult(&Worker::Impl::doWork, [task] {
+        task->runAfter();
+    }, task);
 
-    for (auto& thread : threads) {
-        thread.join();
-    }
-
-    queue->stop();
+    current = (current + 1) % threads.size();
+    return request;
 }
 
-void Worker::send(Fn work, Fn after) {
-    MBGL_VERIFY_THREAD(tid);
-    assert(work);
-
-    if (active++ == 0) {
-        queue->ref();
-    }
-
-    channel.send({work, after});
-}
-
-void Worker::workLoop() {
-#ifdef __APPLE__
-    pthread_setname_np("Worker");
-#endif
-
-    while (true) {
-        Work item = channel.receive();
-
-        if (!item.work)
-            break;
-
-        item.work();
-        queue->send(std::move(item.after));
-    }
-
-    // Make sure to close all other workers too.
-    channel.send(Work());
-}
-
-void Worker::afterWork(Fn after) {
-    if (after) {
-        after();
-    }
-
-    if (--active == 0) {
-        queue->unref();
-    }
-}
-
-}
+} // end namespace mbgl
diff --git a/src/mbgl/util/worker.hpp b/src/mbgl/util/worker.hpp
index 86c2e6acf..0c001e419 100644
--- a/src/mbgl/util/worker.hpp
+++ b/src/mbgl/util/worker.hpp
@@ -2,41 +2,38 @@
 #define MBGL_UTIL_WORKER
 
 #include <mbgl/util/noncopyable.hpp>
-#include <mbgl/util/async_queue.hpp>
-#include <mbgl/util/channel.hpp>
-#include <mbgl/util/util.hpp>
+#include <mbgl/util/thread.hpp>
 
-#include <thread>
 #include <functional>
+#include <memory>
 
 namespace mbgl {
 
+class WorkRequest;
+
 class Worker : public mbgl::util::noncopyable {
 public:
     using Fn = std::function<void ()>;
 
-    Worker(uv_loop_t* loop, std::size_t count);
+    Worker(std::size_t count);
     ~Worker();
 
-    void send(Fn work, Fn after);
+    // Request work be done on a thread pool. The optional after callback is
+    // executed on the invoking thread, which must have a run loop, after the
+    // work is complete.
+    //
+    // The return value represents the request to perform the work asynchronously.
+    // Its destructor guarantees that the work function has finished executing, and
+    // that the after function has either finished executing or will not execute.
+    // Together, this means that an object may make a work request with lambdas which
+    // bind references to itself, and if and when those lambdas execute, the references
+    // will still be valid.
+    std::unique_ptr<WorkRequest> send(Fn work, Fn after);
 
 private:
-    void workLoop();
-    void afterWork(Fn after);
-
-    struct Work {
-        Fn work;
-        Fn after;
-    };
-
-    using Queue = util::AsyncQueue<std::function<void ()>>;
-
-    std::size_t active = 0;
-    Queue* queue = nullptr;
-    Channel<Work> channel;
-    std::vector<std::thread> threads;
-
-    MBGL_STORE_THREAD(tid)
+    class Impl;
+    std::vector<std::unique_ptr<util::Thread<Impl>>> threads;
+    std::size_t current = 0;
 };
 
 }
diff --git a/styles b/styles
index 0ba580207..93a23d762 160000
--- a/styles
+++ b/styles
@@ -1 +1 @@
-Subproject commit 0ba580207b4e915530ee4efc20cb1ac0d5575f49
+Subproject commit 93a23d762332a4c75e3dae1c547c4d810101e978
diff --git a/test/api/repeated_render.cpp b/test/api/repeated_render.cpp
index 25a5d5d28..ce7e6cbb0 100644
--- a/test/api/repeated_render.cpp
+++ b/test/api/repeated_render.cpp
@@ -22,12 +22,10 @@ TEST(API, RepeatedRender) {
 
     Log::setObserver(util::make_unique<FixtureLogObserver>());
 
-    Map map(view, fileSource);
-
-    map.start(Map::Mode::Still);
+    Map map(view, fileSource, MapMode::Still);
 
     {
-        view.resize(128, 512, 1);
+        map.resize(128, 512, 1);
         map.setStyleJSON(style, "test/suite");
         std::promise<std::unique_ptr<const StillImage>> promise;
         map.renderStill([&promise](std::unique_ptr<const StillImage> image) {
@@ -41,7 +39,7 @@ TEST(API, RepeatedRender) {
     }
 
     {
-        view.resize(512, 512, 2);
+        map.resize(512, 512, 2);
         map.setStyleJSON(style, "TEST_DATA/suite");
         std::promise<std::unique_ptr<const StillImage>> promise;
         map.renderStill([&promise](std::unique_ptr<const StillImage> image) {
@@ -54,8 +52,6 @@ TEST(API, RepeatedRender) {
         util::write_file("test/fixtures/api/2.png", png);
     }
 
-    map.stop();
-
     auto observer = Log::removeObserver();
     auto flo = dynamic_cast<FixtureLogObserver*>(observer.get());
     auto unchecked = flo->unchecked();
diff --git a/test/api/set_style.cpp b/test/api/set_style.cpp
index 11921a43c..01ce1f025 100644
--- a/test/api/set_style.cpp
+++ b/test/api/set_style.cpp
@@ -16,13 +16,10 @@ TEST(API, SetStyle) {
 
     Log::setObserver(util::make_unique<FixtureLogObserver>());
 
-    Map map(view, fileSource);
-
-    map.start(Map::Mode::Still);
-
-    map.setStyleJSON("invalid", "test/suite");
-
-    map.stop();
+    {
+        Map map(view, fileSource, MapMode::Still);
+        map.setStyleJSON("invalid", "test/suite");
+    }
 
     auto observer = Log::removeObserver();
     auto flo = dynamic_cast<FixtureLogObserver*>(observer.get());
diff --git a/test/fixtures/api/1.png b/test/fixtures/api/1.png
deleted file mode 100644
index 69e3c8ca9..000000000
Binary files a/test/fixtures/api/1.png and /dev/null differ
diff --git a/test/fixtures/api/2.png b/test/fixtures/api/2.png
deleted file mode 100644
index 2a28c639a..000000000
Binary files a/test/fixtures/api/2.png and /dev/null differ
diff --git a/test/fixtures/database/cache.db b/test/fixtures/database/cache.db
new file mode 100644
index 000000000..c358381f1
Binary files /dev/null and b/test/fixtures/database/cache.db differ
diff --git a/test/fixtures/database/invalid.db b/test/fixtures/database/invalid.db
new file mode 100644
index 000000000..f07e4af03
Binary files /dev/null and b/test/fixtures/database/invalid.db differ
diff --git a/test/headless/headless.cpp b/test/headless/headless.cpp
index aac5dda83..a02062dbd 100644
--- a/test/headless/headless.cpp
+++ b/test/headless/headless.cpp
@@ -86,7 +86,7 @@ TEST_P(HeadlessTest, render) {
                 }
             }
 
-            if (source->value.HasMember("url")) {
+            if (source->value.HasMember("url") && source->value["url"].IsString()) {
                 rewriteLocalScheme(source->value["url"], styleDoc.GetAllocator());
             }
         }
@@ -104,14 +104,13 @@ TEST_P(HeadlessTest, render) {
     ASSERT_FALSE(infoDoc.HasParseError());
     ASSERT_TRUE(infoDoc.IsObject());
 
-    Log::setObserver(util::make_unique<FixtureLogObserver>());
-
-    Log::Info(Event::General, "test fixture %s", base.c_str());
-
     for (auto it = infoDoc.MemberBegin(), end = infoDoc.MemberEnd(); it != end; it++) {
         const std::string name {
             it->name.GetString(), it->name.GetStringLength()
         };
+
+        Log::Info(Event::General, "%s %s", base.c_str(), name.c_str());
+
         const rapidjson::Value& value = it->value;
         ASSERT_TRUE(value.IsObject());
 
@@ -141,21 +140,18 @@ TEST_P(HeadlessTest, render) {
             }
         }
 
-        HeadlessView view(display);
+        std::promise<void> promise;
+
+        HeadlessView view(display, width, height, pixelRatio);
         DefaultFileSource fileSource(nullptr);
-        Map map(view, fileSource);
-
-        map.start(Map::Mode::Still);
+        Map map(view, fileSource, MapMode::Still);
 
+        map.resize(width, height, pixelRatio);
         map.setClasses(classes);
         map.setStyleJSON(style, "test/suite");
-
-        view.resize(width, height, pixelRatio);
         map.setLatLngZoom(mbgl::LatLng(latitude, longitude), zoom);
         map.setBearing(bearing);
 
-        std::promise<void> promise;
-
         map.renderStill([&](std::unique_ptr<const StillImage> image) {
             const std::string png = util::compress_png(image->width, image->height, image->pixels.get());
             util::write_file("test/suite/tests/" + base + "/" + name +  "/actual.png", png);
@@ -163,8 +159,6 @@ TEST_P(HeadlessTest, render) {
         });
 
         promise.get_future().get();
-
-        map.stop();
     }
 }
 
diff --git a/test/ios/MGLTAppDelegate.m b/test/ios/MGLTAppDelegate.m
index 4bd6b6488..bbd67821f 100644
--- a/test/ios/MGLTAppDelegate.m
+++ b/test/ios/MGLTAppDelegate.m
@@ -1,5 +1,6 @@
 #import "MGLTAppDelegate.h"
 #import "MGLTViewController.h"
+#import "MapboxGL.h"
 
 @implementation MGLTAppDelegate
 
@@ -12,6 +13,8 @@
     wrapper.toolbarHidden = YES;
     [self.window makeKeyAndVisible];
 
+    [MGLAccountManager setMapboxMetricsEnabledSettingShownInApp:YES]; // a lie, but a convenient one
+
     return YES;
 }
 
diff --git a/test/ios/MGLTViewController.m b/test/ios/MGLTViewController.m
index e8b500b43..bdce2202d 100644
--- a/test/ios/MGLTViewController.m
+++ b/test/ios/MGLTViewController.m
@@ -12,7 +12,6 @@
 
     _mapView = [[MGLMapView alloc] initWithFrame:self.view.bounds
                                                 accessToken:@"pk.eyJ1IjoianVzdGluIiwiYSI6Ik9RX3RRQzAifQ.dmOg_BAp1ywuDZMM7YsXRg"];
-    _mapView.viewControllerForLayoutGuides = self;
     _mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
 
     [self.view addSubview:_mapView];
diff --git a/test/ios/MapViewTests.m b/test/ios/MapViewTests.m
index fff52adc0..05eafa381 100644
--- a/test/ios/MapViewTests.m
+++ b/test/ios/MapViewTests.m
@@ -13,6 +13,8 @@
 @implementation MapViewTests
 
 - (void)beforeEach {
+    [tester acknowledgeSystemAlert];
+
     [system simulateDeviceRotationToOrientation:UIDeviceOrientationPortrait];
     [tester.viewController resetMapView];
 
diff --git a/test/ios/MetricsTests.m b/test/ios/MetricsTests.m
new file mode 100644
index 000000000..5b1a7956e
--- /dev/null
+++ b/test/ios/MetricsTests.m
@@ -0,0 +1,287 @@
+#import "MGLMapboxEvents.h"
+
+#import "KIFTestActor+MapboxGL.h"
+
+#import <KIF/KIF.h>
+#import <OCMock/OCMock.h>
+
+#import "MapboxGL.h"
+#import "OHHTTPStubs.h"
+
+@interface MGLMapboxEvents (Testing)
+
+- (NSString *)appBundleId;
+- (NSString *)token;
+- (BOOL)isPaused;
+- (NSURLSession *)session;
+- (void)pushEvent:(NSString *)event withAttributes:(NSDictionary *)attributeDictionary;
+- (NSMutableArray *)eventQueue;
+- (void)postEvents:(NSArray *)events;
+- (NSTimer *)timer;
+- (NSUInteger)flushAt;
+- (NSTimeInterval)flushAfter;
+- (void)setFlushAfter:(NSTimeInterval)newFlushAfter;
+- (void)flush;
+- (void)startTimer;
+
+@end
+
+@interface MetricsTests : KIFTestCase
+
+@property (nonatomic) NSTimeInterval defaultFlushAfter;
+
+@end
+
+@implementation MetricsTests
+
+- (void)beforeAll {
+    [tester acknowledgeSystemAlert];
+    self.defaultFlushAfter = [[MGLMapboxEvents sharedManager] flushAfter];
+}
+
+- (void)beforeEach {
+    [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"MGLMapboxMetricsEnabled"];
+    [MGLMapboxEvents resumeMetricsCollection];
+
+    [MGLAccountManager setAccessToken:@"pk.eyJ1IjoianVzdGluIiwiYSI6IlpDbUJLSUEifQ.4mG8vhelFMju6HpIY-Hi5A"];
+
+    [[MGLMapboxEvents sharedManager] setFlushAfter:self.defaultFlushAfter];
+}
+
+- (void)afterEach {
+    [MGLMapboxEvents pauseMetricsCollection];
+}
+
+- (void)pushFakeEvent {
+    [MGLMapboxEvents pushEvent:@"test_event" withAttributes:@{ @"foo" : @"one", @"bar" : @(2) }];
+}
+
+- (void)testAppBundleID {
+    XCTAssertEqualObjects([[MGLMapboxEvents sharedManager] appBundleId], @"com.mapbox.Mapbox-GL-Tests");
+}
+
+- (void)testTokenSetViaMapView {
+    [tester.mapView setAccessToken:@"test_token"];
+
+    XCTAssertEqualObjects([[MGLMapboxEvents sharedManager] token], @"test_token");
+}
+
+- (void)testResumeMetricsCollection {
+    [MGLMapboxEvents resumeMetricsCollection];
+
+    XCTAssertFalse([[MGLMapboxEvents sharedManager] isPaused]);
+    XCTAssertNotNil([[MGLMapboxEvents sharedManager] session]);
+}
+
+- (void)testPauseMetricsCollection {
+    [MGLMapboxEvents pauseMetricsCollection];
+
+    XCTAssertTrue([[MGLMapboxEvents sharedManager] isPaused]);
+    XCTAssertNil([[MGLMapboxEvents sharedManager] session]);
+}
+
+- (void)testFlushAtThreshold {
+    NSUInteger startCount = [[[MGLMapboxEvents sharedManager] eventQueue] count];
+    NSUInteger flushAt = [[MGLMapboxEvents sharedManager] flushAt];
+
+    XCTestExpectation *queueItemsExpectation = [self expectationWithDescription:@"queue should contain events"];
+
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        while (true) {
+            if ([[[MGLMapboxEvents sharedManager] eventQueue] count] > 0) {
+                [queueItemsExpectation fulfill];
+                break;
+            }
+        }
+    });
+
+    for (NSUInteger i = 0; i < (flushAt - startCount - 1); i++) {
+        [self pushFakeEvent];
+    }
+
+    [self waitForExpectationsWithTimeout:1.0 handler:nil];
+
+    XCTestExpectation *emptyQueueExpectation = [self expectationWithDescription:@"queue should be empty"];
+
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        while (true) {
+            if ([[[MGLMapboxEvents sharedManager] eventQueue] count] == 0) {
+                [emptyQueueExpectation fulfill];
+                break;
+            }
+        }
+    });
+
+    [self pushFakeEvent];
+
+    [self waitForExpectationsWithTimeout:1.0 handler:nil];
+}
+
+- (void)testTimerDestroyedAfterFlush {
+    XCTestExpectation *emptyQueueExpectation = [self expectationWithDescription:@"queue should be empty"];
+
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        while (true) {
+            if ([[[MGLMapboxEvents sharedManager] eventQueue] count] == 0) {
+                [emptyQueueExpectation fulfill];
+                break;
+            }
+        }
+    });
+
+    [[MGLMapboxEvents sharedManager] flush];
+
+    [self waitForExpectationsWithTimeout:1.0 handler:nil];
+
+    XCTAssertNil([[MGLMapboxEvents sharedManager] timer]);
+}
+
+- (void)testTimerCreatedAfterEventPushed {
+    XCTestExpectation *emptyQueueExpectation = [self expectationWithDescription:@"queue should be empty"];
+
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        while (true) {
+            if ([[[MGLMapboxEvents sharedManager] eventQueue] count] == 0) {
+                [emptyQueueExpectation fulfill];
+                break;
+            }
+        }
+    });
+
+    [[MGLMapboxEvents sharedManager] flush];
+
+    [self waitForExpectationsWithTimeout:1.0 handler:nil];
+
+    [[MGLMapboxEvents sharedManager] setFlushAfter:5];
+
+    id eventsMock = [OCMockObject partialMockForObject:[MGLMapboxEvents sharedManager]];
+    [[[eventsMock expect] andForwardToRealObject] startTimer];
+    [self pushFakeEvent];
+    [eventsMock verifyWithDelay:0.1];
+
+    XCTAssertEqual([[[MGLMapboxEvents sharedManager] eventQueue] count], 1);
+    XCTAssertNotNil([[MGLMapboxEvents sharedManager] timer]);
+    XCTAssertEqual([[MGLMapboxEvents sharedManager] flushAfter], [[[MGLMapboxEvents sharedManager] timer] timeInterval]);
+}
+
+- (void)testTimerFiresFlush {
+    XCTestExpectation *emptyQueueExpectation = [self expectationWithDescription:@"queue should be empty"];
+
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        while (true) {
+            if ([[[MGLMapboxEvents sharedManager] eventQueue] count] == 0) {
+                [emptyQueueExpectation fulfill];
+                break;
+            }
+        }
+    });
+
+    [[MGLMapboxEvents sharedManager] flush];
+
+    [self waitForExpectationsWithTimeout:1.0 handler:nil];
+
+    [[MGLMapboxEvents sharedManager] setFlushAfter:5];
+    [self pushFakeEvent];
+    id eventsMock = [OCMockObject partialMockForObject:[MGLMapboxEvents sharedManager]];
+    [[eventsMock expect] flush];
+    [eventsMock verifyWithDelay:[[MGLMapboxEvents sharedManager] flushAfter]];
+}
+
+- (void)testFlushPostsEvents {
+    NSArray *events = [NSArray arrayWithArray:[[MGLMapboxEvents sharedManager] eventQueue]];
+
+    id eventsMock = [OCMockObject partialMockForObject:[MGLMapboxEvents sharedManager]];
+    [[eventsMock expect] postEvents:events];
+    [[MGLMapboxEvents sharedManager] flush];
+    [eventsMock verifyWithDelay:1.0];
+
+    XCTAssertTrue([[[MGLMapboxEvents sharedManager] eventQueue] count] == 0);
+}
+
+- (void)testPostEventsNetworkRequest {
+    XCTestExpectation *requestExpectation = [self expectationWithDescription:@"posting events generates network request"];
+    XCTestExpectation *contentTypeExpectation = [self expectationWithDescription:@"events are posted as JSON"];
+    XCTestExpectation *userAgentExpectation = [self expectationWithDescription:@"events are posted with proper user agent"];
+
+    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+        return [request.URL.path hasPrefix:@"/events/v1"];
+    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+        if ([request.URL.absoluteString isEqualToString:[@"https://api.tiles.mapbox.com/events/v1?access_token=" stringByAppendingString:[MGLAccountManager accessToken]]]) {
+            [requestExpectation fulfill];
+        }
+
+        if ([request.allHTTPHeaderFields[@"Content-Type"] isEqualToString:@"application/json"]) {
+            [contentTypeExpectation fulfill];
+        }
+
+        if ([request.allHTTPHeaderFields[@"User-Agent"] isEqualToString:[NSString stringWithFormat:@"%@/1.0/1.0 MapboxEventsiOS/1.0", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"]]]) {
+            [userAgentExpectation fulfill];
+        }
+
+        return nil;
+    }];
+
+    [self pushFakeEvent];
+    [MGLMapboxEvents flush];
+
+    [self waitForExpectationsWithTimeout:1.0 handler:nil];
+}
+
+- (void)testPushEventAddsToEventQueue {
+    XCTestExpectation *queueSizeIncreaseExpectation = [self expectationWithDescription:@"event queue size increase"];
+
+    NSUInteger beforeCount = [[[MGLMapboxEvents sharedManager] eventQueue] count];
+
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        while (true) {
+            if ([[[MGLMapboxEvents sharedManager] eventQueue] count] == (beforeCount + 1)) {
+                [queueSizeIncreaseExpectation fulfill];
+                break;
+            }
+        }
+    });
+
+    [self pushFakeEvent];
+
+    [self waitForExpectationsWithTimeout:1.0 handler:nil];
+}
+
+- (void)testOptOutUpfrontDisablesMetrics {
+    [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"MGLMapboxMetricsEnabled"];
+
+    NSUInteger startingCount = [[[MGLMapboxEvents sharedManager] eventQueue] count];
+
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        while (true) {
+            if ([[[MGLMapboxEvents sharedManager] eventQueue] count] > startingCount) {
+                XCTFail(@"queue should not receive events when opted-out");
+                break;
+            }
+        }
+    });
+
+    [self pushFakeEvent];
+
+    [tester waitForTimeInterval:1.0];
+}
+
+- (void)testOptOutAtRuntimeDisablesMetrics {
+    XCTAssertTrue([[NSUserDefaults standardUserDefaults] boolForKey:@"MGLMapboxMetricsEnabled"]);
+
+    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+        return [request.URL.path hasPrefix:@"/events/v1"];
+    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+        XCTFail(@"opt-out should not post events");
+        return nil;
+    }];
+
+    [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"MGLMapboxMetricsEnabled"];
+
+    [self pushFakeEvent];
+
+    [[MGLMapboxEvents sharedManager] flush];
+
+    [tester waitForTimeInterval:1.0];
+}
+
+@end
diff --git a/test/ios/OCMock/OCMock/NSNotificationCenter+OCMAdditions.h b/test/ios/OCMock/OCMock/NSNotificationCenter+OCMAdditions.h
new file mode 100644
index 000000000..c20a9c2b2
--- /dev/null
+++ b/test/ios/OCMock/OCMock/NSNotificationCenter+OCMAdditions.h
@@ -0,0 +1,26 @@
+/*
+ *  Copyright (c) 2009-2014 Erik Doernenburg and contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+ *  not use these files except in compliance with the License. You may obtain
+ *  a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations
+ *  under the License.
+ */
+
+#import <Foundation/Foundation.h>
+
+@class OCObserverMockObject;
+
+
+@interface NSNotificationCenter(OCMAdditions)
+
+- (void)addMockObserver:(OCObserverMockObject *)notificationObserver name:(NSString *)notificationName object:(id)notificationSender;
+
+@end
diff --git a/test/ios/OCMock/OCMock/OCMArg.h b/test/ios/OCMock/OCMock/OCMArg.h
new file mode 100644
index 000000000..d53437cb7
--- /dev/null
+++ b/test/ios/OCMock/OCMock/OCMArg.h
@@ -0,0 +1,53 @@
+/*
+ *  Copyright (c) 2009-2014 Erik Doernenburg and contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+ *  not use these files except in compliance with the License. You may obtain
+ *  a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations
+ *  under the License.
+ */
+
+#import <Foundation/Foundation.h>
+
+@interface OCMArg : NSObject 
+
+// constraining arguments
+
++ (id)any;
++ (SEL)anySelector;
++ (void *)anyPointer;
++ (id __autoreleasing *)anyObjectRef;
++ (id)isNil;
++ (id)isNotNil;
++ (id)isEqual:(id)value;
++ (id)isNotEqual:(id)value;
++ (id)isKindOfClass:(Class)cls;
++ (id)checkWithSelector:(SEL)selector onObject:(id)anObject;
++ (id)checkWithBlock:(BOOL (^)(id obj))block;
+
+// manipulating arguments
+
++ (id *)setTo:(id)value;
++ (void *)setToValue:(NSValue *)value;
+
+// internal use only
+
++ (id)resolveSpecialValues:(NSValue *)value;
+
+@end
+
+#define OCMOCK_ANY [OCMArg any]
+
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+  #define OCMOCK_VALUE(variable) \
+    ({ __typeof__(variable) __v = (variable); [NSValue value:&__v withObjCType:@encode(__typeof__(__v))]; })
+#else
+  #define OCMOCK_VALUE(variable) [NSValue value:&variable withObjCType:@encode(__typeof__(variable))]
+#endif
diff --git a/test/ios/OCMock/OCMock/OCMConstraint.h b/test/ios/OCMock/OCMock/OCMConstraint.h
new file mode 100644
index 000000000..777966ab7
--- /dev/null
+++ b/test/ios/OCMock/OCMock/OCMConstraint.h
@@ -0,0 +1,71 @@
+/*
+ *  Copyright (c) 2007-2014 Erik Doernenburg and contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+ *  not use these files except in compliance with the License. You may obtain
+ *  a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations
+ *  under the License.
+ */
+
+#import <Foundation/Foundation.h>
+
+
+@interface OCMConstraint : NSObject 
+
++ (instancetype)constraint;
+- (BOOL)evaluate:(id)value;
+
+// if you are looking for any, isNil, etc, they have moved to OCMArg
+
+// try to use [OCMArg checkWith...] instead of the constraintWith... methods below
+
++ (instancetype)constraintWithSelector:(SEL)aSelector onObject:(id)anObject;
++ (instancetype)constraintWithSelector:(SEL)aSelector onObject:(id)anObject withValue:(id)aValue;
+
+
+@end
+
+@interface OCMAnyConstraint : OCMConstraint
+@end
+
+@interface OCMIsNilConstraint : OCMConstraint
+@end
+
+@interface OCMIsNotNilConstraint : OCMConstraint
+@end
+
+@interface OCMIsNotEqualConstraint : OCMConstraint
+{
+	@public
+	id testValue;
+}
+
+@end
+
+@interface OCMInvocationConstraint : OCMConstraint
+{
+	@public
+	NSInvocation *invocation;
+}
+
+@end
+
+@interface OCMBlockConstraint : OCMConstraint
+{
+	BOOL (^block)(id);
+}
+
+- (instancetype)initWithConstraintBlock:(BOOL (^)(id))block;
+
+@end
+
+
+#define CONSTRAINT(aSelector) [OCMConstraint constraintWithSelector:aSelector onObject:self]
+#define CONSTRAINTV(aSelector, aValue) [OCMConstraint constraintWithSelector:aSelector onObject:self withValue:(aValue)]
diff --git a/test/ios/OCMock/OCMock/OCMLocation.h b/test/ios/OCMock/OCMock/OCMLocation.h
new file mode 100644
index 000000000..e510db7aa
--- /dev/null
+++ b/test/ios/OCMock/OCMock/OCMLocation.h
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2014 Erik Doernenburg and contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+ *  not use these files except in compliance with the License. You may obtain
+ *  a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations
+ *  under the License.
+ */
+
+#import <Foundation/Foundation.h>
+
+@interface OCMLocation : NSObject
+{
+    id          testCase;
+    NSString    *file;
+    NSUInteger  line;
+}
+
++ (instancetype)locationWithTestCase:(id)aTestCase file:(NSString *)aFile line:(NSUInteger)aLine;
+
+- (instancetype)initWithTestCase:(id)aTestCase file:(NSString *)aFile line:(NSUInteger)aLine;
+
+- (id)testCase;
+- (NSString *)file;
+- (NSUInteger)line;
+
+@end
+
+extern OCMLocation *OCMMakeLocation(id testCase, const char *file, int line);
diff --git a/test/ios/OCMock/OCMock/OCMMacroState.h b/test/ios/OCMock/OCMock/OCMMacroState.h
new file mode 100644
index 000000000..4b2d63508
--- /dev/null
+++ b/test/ios/OCMock/OCMock/OCMMacroState.h
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2014 Erik Doernenburg and contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+ *  not use these files except in compliance with the License. You may obtain
+ *  a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations
+ *  under the License.
+ */
+
+#import <Foundation/Foundation.h>
+
+@class OCMLocation;
+@class OCMRecorder;
+@class OCMStubRecorder;
+@class OCMockObject;
+
+
+@interface OCMMacroState : NSObject
+{
+    OCMRecorder *recorder;
+}
+
++ (void)beginStubMacro;
++ (OCMStubRecorder *)endStubMacro;
+
++ (void)beginExpectMacro;
++ (OCMStubRecorder *)endExpectMacro;
+
++ (void)beginVerifyMacroAtLocation:(OCMLocation *)aLocation;
++ (void)endVerifyMacro;
+
++ (OCMMacroState *)globalState;
+
+- (OCMRecorder *)recorder;
+
+- (void)switchToClassMethod;
+
+@end
diff --git a/test/ios/OCMock/OCMock/OCMRecorder.h b/test/ios/OCMock/OCMock/OCMRecorder.h
new file mode 100644
index 000000000..f56d2ca4c
--- /dev/null
+++ b/test/ios/OCMock/OCMock/OCMRecorder.h
@@ -0,0 +1,39 @@
+/*
+ *  Copyright (c) 2014 Erik Doernenburg and contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+ *  not use these files except in compliance with the License. You may obtain
+ *  a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations
+ *  under the License.
+ */
+
+#import <Foundation/Foundation.h>
+
+@class OCMockObject;
+@class OCMInvocationMatcher;
+
+
+@interface OCMRecorder : NSProxy
+{
+    OCMockObject         *mockObject;
+    OCMInvocationMatcher *invocationMatcher;
+}
+
+- (instancetype)init;
+- (instancetype)initWithMockObject:(OCMockObject *)aMockObject;
+
+- (void)setMockObject:(OCMockObject *)aMockObject;
+
+- (OCMInvocationMatcher *)invocationMatcher;
+
+- (id)classMethod;
+- (id)ignoringNonObjectArgs;
+
+@end
diff --git a/test/ios/OCMock/OCMock/OCMStubRecorder.h b/test/ios/OCMock/OCMock/OCMStubRecorder.h
new file mode 100644
index 000000000..890c9ef3b
--- /dev/null
+++ b/test/ios/OCMock/OCMock/OCMStubRecorder.h
@@ -0,0 +1,56 @@
+/*
+ *  Copyright (c) 2004-2014 Erik Doernenburg and contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+ *  not use these files except in compliance with the License. You may obtain
+ *  a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations
+ *  under the License.
+ */
+
+#import "OCMRecorder.h"
+
+
+@interface OCMStubRecorder : OCMRecorder
+
+- (id)andReturn:(id)anObject;
+- (id)andReturnValue:(NSValue *)aValue;
+- (id)andThrow:(NSException *)anException;
+- (id)andPost:(NSNotification *)aNotification;
+- (id)andCall:(SEL)selector onObject:(id)anObject;
+- (id)andDo:(void (^)(NSInvocation *invocation))block;
+- (id)andForwardToRealObject;
+
+@end
+
+
+@interface OCMStubRecorder (Properties)
+
+#define andReturn(aValue) _andReturn(({ __typeof__(aValue) _v = (aValue); [NSValue value:&_v withObjCType:@encode(__typeof__(_v))]; }))
+@property (nonatomic, readonly) OCMStubRecorder *(^ _andReturn)(NSValue *);
+
+#define andThrow(anException) _andThrow(anException)
+@property (nonatomic, readonly) OCMStubRecorder *(^ _andThrow)(NSException *);
+
+#define andPost(aNotification) _andPost(aNotification)
+@property (nonatomic, readonly) OCMStubRecorder *(^ _andPost)(NSNotification *);
+
+#define andCall(anObject, aSelector) _andCall(anObject, aSelector)
+@property (nonatomic, readonly) OCMStubRecorder *(^ _andCall)(id, SEL);
+
+#define andDo(aBlock) _andDo(aBlock)
+@property (nonatomic, readonly) OCMStubRecorder *(^ _andDo)(void (^)(NSInvocation *));
+
+#define andForwardToRealObject() _andForwardToRealObject()
+@property (nonatomic, readonly) OCMStubRecorder *(^ _andForwardToRealObject)(void);
+
+@end
+
+
+
diff --git a/test/ios/OCMock/OCMock/OCMock.h b/test/ios/OCMock/OCMock/OCMock.h
new file mode 100644
index 000000000..f0083b350
--- /dev/null
+++ b/test/ios/OCMock/OCMock/OCMock.h
@@ -0,0 +1,84 @@
+/*
+ *  Copyright (c) 2004-2014 Erik Doernenburg and contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+ *  not use these files except in compliance with the License. You may obtain
+ *  a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations
+ *  under the License.
+ */
+
+#import <OCMock/OCMockObject.h>
+#import <OCMock/OCMRecorder.h>
+#import <OCMock/OCMStubRecorder.h>
+#import <OCMock/OCMConstraint.h>
+#import <OCMock/OCMArg.h>
+#import <OCMock/OCMLocation.h>
+#import <OCMock/OCMMacroState.h>
+#import <OCMock/NSNotificationCenter+OCMAdditions.h>
+
+
+#define OCMClassMock(cls) [OCMockObject niceMockForClass:cls]
+
+#define OCMStrictClassMock(cls) [OCMockObject mockForClass:cls]
+
+#define OCMProtocolMock(protocol) [OCMockObject niceMockForProtocol:protocol]
+
+#define OCMStrictProtocolMock(protocol) [OCMockObject mockForProtocol:protocol]
+
+#define OCMPartialMock(obj) [OCMockObject partialMockForObject:obj]
+
+#define OCMObserverMock() [OCMockObject observerMock]
+
+
+#define OCMStub(invocation) \
+({ \
+    _OCMSilenceWarnings( \
+        [OCMMacroState beginStubMacro]; \
+        invocation; \
+        [OCMMacroState endStubMacro]; \
+    ); \
+})
+
+#define OCMExpect(invocation) \
+({ \
+    _OCMSilenceWarnings( \
+        [OCMMacroState beginExpectMacro]; \
+        invocation; \
+        [OCMMacroState endExpectMacro]; \
+    ); \
+})
+
+#define ClassMethod(invocation) \
+    _OCMSilenceWarnings( \
+        [[OCMMacroState globalState] switchToClassMethod]; \
+        invocation; \
+    );
+
+
+#define OCMVerifyAll(mock) [mock verifyAtLocation:OCMMakeLocation(self, __FILE__, __LINE__)]
+
+#define OCMVerifyAllWithDelay(mock, delay) [mock verifyWithDelay:delay atLocation:OCMMakeLocation(self, __FILE__, __LINE__)]
+
+#define OCMVerify(invocation) \
+({ \
+    _OCMSilenceWarnings( \
+        [OCMMacroState beginVerifyMacroAtLocation:OCMMakeLocation(self, __FILE__, __LINE__)]; \
+        invocation; \
+        [OCMMacroState endVerifyMacro]; \
+    ); \
+})
+
+#define _OCMSilenceWarnings(macro) \
+({ \
+    _Pragma("clang diagnostic push") \
+    _Pragma("clang diagnostic ignored \"-Wunused-value\"") \
+    macro \
+    _Pragma("clang diagnostic pop") \
+})
diff --git a/test/ios/OCMock/OCMock/OCMockObject.h b/test/ios/OCMock/OCMock/OCMockObject.h
new file mode 100644
index 000000000..63f2bae2b
--- /dev/null
+++ b/test/ios/OCMock/OCMock/OCMockObject.h
@@ -0,0 +1,74 @@
+/*
+ *  Copyright (c) 2004-2014 Erik Doernenburg and contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+ *  not use these files except in compliance with the License. You may obtain
+ *  a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations
+ *  under the License.
+ */
+
+#import <Foundation/Foundation.h>
+
+@class OCMLocation;
+@class OCMInvocationStub;
+@class OCMStubRecorder;
+@class OCMInvocationMatcher;
+@class OCMInvocationExpectation;
+
+
+@interface OCMockObject : NSProxy
+{
+	BOOL			isNice;
+	BOOL			expectationOrderMatters;
+	NSMutableArray	*stubs;
+	NSMutableArray	*expectations;
+	NSMutableArray	*exceptions;
+    NSMutableArray  *invocations;
+}
+
++ (id)mockForClass:(Class)aClass;
++ (id)mockForProtocol:(Protocol *)aProtocol;
++ (id)partialMockForObject:(NSObject *)anObject;
+
++ (id)niceMockForClass:(Class)aClass;
++ (id)niceMockForProtocol:(Protocol *)aProtocol;
+
++ (id)observerMock;
+
+- (instancetype)init;
+
+- (void)setExpectationOrderMatters:(BOOL)flag;
+
+- (id)stub;
+- (id)expect;
+- (id)reject;
+
+- (id)verify;
+- (id)verifyAtLocation:(OCMLocation *)location;
+
+- (void)verifyWithDelay:(NSTimeInterval)delay;
+- (void)verifyWithDelay:(NSTimeInterval)delay atLocation:(OCMLocation *)location;
+
+- (void)stopMocking;
+
+// internal use only
+
+- (void)addStub:(OCMInvocationStub *)aStub;
+- (void)addExpectation:(OCMInvocationExpectation *)anExpectation;
+
+- (BOOL)handleInvocation:(NSInvocation *)anInvocation;
+- (void)handleUnRecordedInvocation:(NSInvocation *)anInvocation;
+- (BOOL)handleSelector:(SEL)sel;
+
+- (void)verifyInvocation:(OCMInvocationMatcher *)matcher;
+- (void)verifyInvocation:(OCMInvocationMatcher *)matcher atLocation:(OCMLocation *)location;
+
+@end
+
diff --git a/test/ios/OCMock/libOCMock.a b/test/ios/OCMock/libOCMock.a
new file mode 100644
index 000000000..9bb38e21a
Binary files /dev/null and b/test/ios/OCMock/libOCMock.a differ
diff --git a/test/ios/OHHTTPStubs/.gitignore b/test/ios/OHHTTPStubs/.gitignore
new file mode 100644
index 000000000..a1e5f0b70
--- /dev/null
+++ b/test/ios/OHHTTPStubs/.gitignore
@@ -0,0 +1,15 @@
+# Xcode
+build/*
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+profile
+*.moved-aside
+.DS_Store
+*.xccheckout
diff --git a/test/ios/OHHTTPStubs/.travis.yml b/test/ios/OHHTTPStubs/.travis.yml
new file mode 100644
index 000000000..42f139e91
--- /dev/null
+++ b/test/ios/OHHTTPStubs/.travis.yml
@@ -0,0 +1,14 @@
+language: objective-c
+
+before_install:
+  - gem install xcpretty --no-rdoc --no-ri --no-document --quiet
+
+env:
+  #- RAKETASK="simlist"
+  #- RAKETASK="ios[iOS StaticLib,7.1,test]"
+  - RAKETASK="ios[iOS StaticLib,latest,test]"
+  - RAKETASK="ios[iOS Framework,latest,analyze]"
+  - RAKETASK="osx[Mac Framework,x86_64,test]"
+
+script:
+  - rake "$RAKETASK"
diff --git a/test/ios/OHHTTPStubs/CHANGELOG.md b/test/ios/OHHTTPStubs/CHANGELOG.md
new file mode 100644
index 000000000..40a1315c5
--- /dev/null
+++ b/test/ios/OHHTTPStubs/CHANGELOG.md
@@ -0,0 +1,226 @@
+_You can download previous versions [here](https://github.com/AliSoftware/OHHTTPStubs/tags) and latest version [here](https://github.com/AliSoftware/OHHTTPStubs/zipball/master) (ZIP files generated by GitHub on the fly)_
+
+## [4.0.1](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/4.0.1)
+
+* Fix threading in `NSURLProtocol` subclass calling `NSURLProtocolClient` callbacks from wrong thread. ([@nsprogrammer](https://github.com/nsprogrammer), [#96](https://github.com/AliSoftware/OHHTTPStubs/pull/96))
+
+## [4.0.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/4.0.0) — Improvements for Swift 
+
+* Annotated the library with _nullability_ attributes to generate a better API when used in Swift
+* Migrated the path utility macros to functions in `OHPathHelpers.h`, for Swift compatibility ([#100](https://github.com/AliSoftware/OHHTTPStubs/issues/100)).
+* Added a complete Swift Demo Project ([#88](https://github.com/AliSoftware/OHHTTPStubs/issues/88))
+* Removed the  `XCTestExpectation` subspec that was added for Xcode 5 support — Now that Xcode 6 is widely adopted, you shouldn't need this anymore (but in case you still need it, I will probably create a dedicated pod for that)
+
+## [3.1.12](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/3.1.12)
+
+* Fixed issue with HTTP 300 return code (multiple-choice) that is not supposed to redirect. ([@tarbrain](https://github.com/tarbrain), [#92](https://github.com/AliSoftware/OHHTTPStubs/pull/92))
+
+## [3.1.11](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/3.1.11)
+
+* Added [Carthage](https://github.com/Carthage/Carthage) support
+* Splitted the Xcode projects for more clarity (one dedicated to build the lib and run Unit Tests, and one for the Demo)
+* Got rid of the `git submodule` used for Unit Tests against [AFNetworking](https://github.com/AFNetworking/AFNetworking) — it is now imported using [CocoaPods](http://cocoapods.org) and only for the lib's Unit Tests targets ([@corinnekrych](https://github.com/corinnekrych), [#90](https://github.com/AliSoftware/OHHTTPStubs/pull/90))
+* Improved [Travis-CI](https://travis-ci.org/AliSoftware/OHHTTPStubs) integration. We now use a build matrix to have paralellized and independant builds for each scheme (iOS Static Lib, iOS Dynamic Framework, OSX Framework)
+* Fixed [#80](https://github.com/AliSoftware/OHHTTPStubs/issues/80) again (there was still an issue for people using Xcode 5 & SDK 7.1… if those people still exists)
+
+## [3.1.10](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/3.1.10)
+
+* Fix headers for people still building with Xcode 5 & SDK 7 ([#80](https://github.com/AliSoftware/OHHTTPStubs/issues/80))
+
+## [3.1.9](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/3.1.9)
+
+* Use `NS_DESIGNATED_INITIALIZER` macro on designated initializer methods ([#79](https://github.com/AliSoftware/OHHTTPStubs/pull/79))
+
+## [3.1.8](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/3.1.8)
+
+* Use `application/json` instead of `text/json` in `README`'s example ([#75](https://github.com/AliSoftware/OHHTTPStubs/pull/75))
+* Fixed an issue with empty files (when using `responseWithFileAtPath:statusCode:headers:` but the file at the specified path is empty)
+
+## [3.1.7](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/3.1.7)
+
+* Added `DEFINES_MODULE` Flag to be easily imported in Swift ([#74](https://github.com/AliSoftware/OHHTTPStubs/pull/74))
+
+_(I also moved [Travis-CI build system](https://travis-ci.org/AliSoftware/OHHTTPStubs) so it now uses `xcpretty` instead of `xctool` to run Unit Tests)_
+
+## [3.1.6](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/3.1.6)
+
+* Fixed issue with the main thread stalling when an `NSException` was raised in the response block
+* Fixed an issue with `OHHTTPStubs/XCTestExpectation` conditional compilation in Xcode 6.0 & OSX SDK.  
+  _(the condition was previously testing available SDKs instead of Xcode version, which led to errors with Xcode 6.0 not having the latest 10.10 SDK yet, but still having the `XCTestExpectation` already anyway)_
+
+## [3.1.5](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/3.1.5)
+
+* Migrated Unit Tests to XCTest.
+* Added `XCTestExpectation` subspec containing my own implementation for Xcode 5 support
+
+## [3.1.4](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/3.1.4)
+
+* Fix issue that made stubs never being called on iOS8 (#65).
+
+> _As of Xcode6 Beta4, **`OHHTTPStubs` compatibility with iOS8** has been validated now._
+
+
+## [3.1.3](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/3.1.3)
+
+* Fix #66: Use the ivar directly in initialization (to avoid KVO side effects)
+
+## [3.1.2](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/3.1.2)
+
+* Fix broken link in README (#61)
+* Don't override Content-Length header when already set (#62)
+
+## [3.1.1](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/3.1.1)
+
+* Fixing a crash when using very very long data #57/#59
+* Fixing issue #51 regarding a probable race condition when stubs were removed before the request has finished
+* Shorten the README.md file and moved all the usage examples in a dedicated wiki page to avoid a endless and frightening README
+
+## [3.1.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/3.1.0)
+
+* The `OHHTTPStubsDescriptor` protocol now inherits from the `NSObject` protocol
+
+## [3.0.4](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/3.0.4)
+
+Fixing issue #47 when stubs were not called, especially when the `OHHTTPStubs` pod were loaded both by the application AND the test target/bundle. See also [[A tricky case with Application Tests]].
+
+* `NSURLSessionConfiguration` 's swizzling (to add automatic support of `OHHTTPStubs` to `NSURLSession`) is now done in the `+load` method of an `NSURLSessionConfiguration` category, to be sure it is loaded (and swizzled) only once, even if `OHHTTPStubs` is loaded by two different bundles.
+* The stubs activation of `NSURLSessionConfiguration` no longer uses `objc_getClass` but uses a call to the `OHHTTPStubs` class instead, which ensure that it uses the correct `OHHTTPStubs` class in the current bundle instead of always using the one loaded from the main bundle.
+
+## [3.0.3](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/3.0.3)
+
+* Adding Mac framework & Mac Test Target (#44)
+* Adding known limitations in README
+
+## [3.0.2](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/3.0.2)
+
+* Fixed issue with cookies when `request.URL` is `nil` ([#39](https://github.com/AliSoftware/OHHTTPStubs/pull/39))
+* Fixed missing `-ObjC` flag in Unit Tests target _(that made it unable to call category methods)_
+* Fixed Unit Tests on iOS6 _(`NSURLSession`-related Unit Tests now only executed when run on iOS7+ or OSX10.9+, and skipped if targeted for an earlier OS version, as `NSURLSession` was not available then)_
+
+## [3.0.1](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/3.0.1)
+
+* Fixed issue with `NSURLSessionConfiguration` auto-swizzling (#37 & #38)
+
+> _Now `OHHTTPStubs` automagically works with `NSURLSessionConfiguration` **without the need** to enable it for every `NSURLSessionConfiguration` before creating the `NSURLSession`: the `defaultSessionConfiguration` and `ephemeralSessionConfiguration` are now preconfigured automatically to work with `OHHTTPStubs`)_
+
+## [3.0.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/3.0.0)
+
+* Removed deprecated methods.
+
+> The Old API has now totally disappeared, leaving only a clean and simple API without the spam due to old deprecated methods.
+
+Note: **If you have already removed the calls to all `OHHTTPStubs` deprecated API in your code, you can switch to this `3.0.0` version without any further changes in your code**.
+
+## [2.4.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/2.4.0)
+
+* Added support for `NSURLSession` (thx to @ndonald2) [#31](https://github.com/AliSoftware/OHHTTPStubs/issues/31) [#34](https://github.com/AliSoftware/OHHTTPStubs/issues/34)
+
+## [2.3.1](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/2.3.1)
+
+* Fixed bug with OHHTTPStubsResponse+JSON when `nil` headers dictionary
+
+## [2.3.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/2.3.0)
+
+* Added the ability to give a name to a stub, for debugging purposes (property `name` of `id<OHHTTPStubsDescriptor>`)
+* Added `allStubs` method to list all installed stubs (with their name if they have one, see previous point)
+* Added `+[OHHTTPStubs onStubActivation:]` method to execute arbitrary code each time a stub is activated. Useful to log which stub is used for each request for example.
+
+## [2.2.1](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/2.2.1)
+
+* Complete refactoring to use `NSInputStream` instead of direct use of `NSData` (Thanks to @kcharwood - #28)
+* Some other code refactoring to split the code in categories and make it clearer
+* Some API changes to make `OHHTTPStubs` to fit the new possibility of setting both `requestTime` and `responseTime`.
+  * Old API is still there but deprecated, and will be removed in next major version
+  * To convert to the new API, you will mainly simply:
+     * extract the `responseTime:` parameter to a method call of its own (`return [OHHTTPStubsResponse responseWithData:data statusCode:code responseTime:time headers:header];` will become `return [[OHHTTPStubsResponse responseWithData:data statusCode:code headers:headers] responseTime:time];` etc.)
+     * convert `responseWithFile:filename` to `responseWithFileAtPath:OHPathForFileInBundle(filename,nil)`
+
+> Note: version `2.1.0-RC`, `2.1.0-rc.1`, `2.2.0-RC` and `2.2.1-RC` were intermediate Release Candidate versions during the big refactoring and migration to `2.2.1`, with the same new features as listed above basicaly, but without the last-minute bugfixes before official release.
+
+## [2.0.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/2.0.0)
+
+* Simplified API
+  * removed instance methods, no more public `sharedInstance`: directly call class methods on the `OHHTTPStubs` class
+  * The old and problematic `addRequestHandler:` method has been deprecated and should not be used anymore. Use `stubRequestsPassingTest:withStubResponse:` instead, which is more efficient
+* Added API documentation in the headers
+* Remove all internal uses of Apple's private APIs
+
+> _Be careful: if you forgot to remove your use of `OHHTTPStubs` and your stubs from the binary you sent to the AppStore, your app would have been rejected by Apple before 2.0.0, as it was using private API (which was a way to make sure not to forget to remove them), but now it would be accepted silently. So don't forget to remove your stubs and `OHHTTPStubs` from your final binary!_
+
+## [1.2.2](https://github.com/AliSoftware/OHHTTPStubs/tree/1.2.2)
+
+* Fixed Deadlock introduced by 1.2.1
+
+## [1.2.1](https://github.com/AliSoftware/OHHTTPStubs/tree/1.2.1)
+
+* Improved thread-safety (#21)
+* Stop sending messages to `NSURLProtoclClient` after `stopLoading`
+
+> _This version is buggy as it introduced a deadlock when performing a request on the main thread. 1.2.2 fixes that issue._
+
+## [1.2.0](https://github.com/AliSoftware/OHHTTPStubs/tree/1.2.0)
+
+* Added support for "HTTP Message Data" stubs generated with `curl -is <someurl>` to replay them easily (#27). See the `README.md` for more info
+* Added redirect support for 3xx response codes (#23)
+* Dropped non-ARC support. Now `OHHTTPStubs` is to be compiled using ARC. _(This should not change anything as it is intended to be integrated using CocoaPods or compiled in a separate xcodeproj anyway)_
+
+## [1.1.2](https://github.com/AliSoftware/OHHTTPStubs/tree/1.1.2)
+
+Easier integration process:
+
+* Use `#import <OHHTTPStubs/OHHTTPStubs.h>` again
+* But adding the path to the library headers in your application project's `HEADER_SEARCH_PATH` is no longer needed!
+
+## [1.1.1](https://github.com/AliSoftware/OHHTTPStubs/tree/1.1.1)
+
+* Fixed crash when calling "setEnabled:" / "registerClass:" multiple times
+* New integration process: we don't use the `PortableLibrary.xcconfig` anymore (as it generated problems for people using configuration with names other than "Debug" and "Release"). _(1)_
+
+_You will now have to indicate the folder containing headers for `OHHTTPStubs` in your `HEADER_SEARCH_PATH` Build Settings, and we are back to `#import "OHHTTPStubs.h"` until a better solution is found_
+
+> _(1) This modification for the integration process did only last for version 1.1.1. Version 1.1.2 restored `#import <OHHTTPStubs/OHHTTPStubs.h>` (but using a much better solution than the previous xcconfig used) and filling `HEADER_SEARCH_PATH` is no longer needed in further versions. See changelog for 1.1.2 above._
+
+## [1.1.0](https://github.com/AliSoftware/OHHTTPStubs/tree/1.1.0)
+
+* Added new API `shouldStubRequest:withRequestHandler:` to avoid useless building of stubbed response like `addRequestHandler:` does
+
+## [1.0.6](https://github.com/AliSoftware/OHHTTPStubs/tree/1.0.6)
+
+* Adding support for cookies (Set-Cookie headers)
+
+## [1.0.5](https://github.com/AliSoftware/OHHTTPStubs/tree/1.0.5)
+
+* Added Unit Tests
+* Removed calls to the deprecated `dispatch_get_current_queue()` GCD function (was used with `dispatch_after` to add fake delay to stubbed responses)
+
+## [1.0.4](https://github.com/AliSoftware/OHHTTPStubs/tree/1.0.4)
+
+* Fixed #6 : "responseWithError:" released response object too soon
+
+## [1.0.3](https://github.com/AliSoftware/OHHTTPStubs/tree/1.0.3)
+
+* Fixed small compilation issues #4 (issue in sample code) & #5 (ARC invalid cast)
+
+## [1.0.2](https://github.com/AliSoftware/OHHTTPStubs/tree/1.0.2)
+
+* Embedded `OHHTTPStubs` in a neat static library for nicer integration in your Xcode4 workspaces.
+
+## [1.0.1](https://github.com/AliSoftware/OHHTTPStubs/tree/1.0.1)
+
+* Fix issue when used in a SenTestCase
+
+## [1.0.0](https://github.com/AliSoftware/OHHTTPStubs/tree/1.0.0)
+
+* Cleaning API, added `removeLastHandler` and `removeRequestHandler:` method.
+* Now first stable API in this version.
+* Example project now compatible with ARC and non-ARC environments
+
+## [0.2.0](https://github.com/AliSoftware/OHHTTPStubs/tree/0.2.0)
+
+* Added Example project
+* Added ARC support
+* Some fixes
+
+## [0.1.0](https://github.com/AliSoftware/OHHTTPStubs/tree/0.1.0)
+
+* Initial version
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/MainViewController.h b/test/ios/OHHTTPStubs/Examples/ObjC/MainViewController.h
new file mode 100644
index 000000000..bf1a8f5fc
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/MainViewController.h
@@ -0,0 +1,13 @@
+//
+//  MainViewController.h
+//  OHHTTPStubsDemo
+//
+//  Created by Olivier Halligon on 11/08/12.
+//  Copyright (c) 2012 AliSoftware. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface MainViewController : UIViewController
+
+@end
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/MainViewController.m b/test/ios/OHHTTPStubs/Examples/ObjC/MainViewController.m
new file mode 100644
index 000000000..327a4d2d2
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/MainViewController.m
@@ -0,0 +1,169 @@
+//
+//  MainViewController.m
+//  OHHTTPStubsDemo
+//
+//  Created by Olivier Halligon on 11/08/12.
+//  Copyright (c) 2012 AliSoftware. All rights reserved.
+//
+
+#import "MainViewController.h"
+#import <OHHTTPStubs/OHHTTPStubs.h>
+
+
+@interface MainViewController ()
+// IBOutlets
+@property (retain, nonatomic) IBOutlet UISwitch *delaySwitch;
+@property (retain, nonatomic) IBOutlet UITextView *textView;
+@property (retain, nonatomic) IBOutlet UISwitch *installTextStubSwitch;
+@property (retain, nonatomic) IBOutlet UIImageView *imageView;
+@property (retain, nonatomic) IBOutlet UISwitch *installImageStubSwitch;
+@end
+
+@implementation MainViewController
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Init & Dealloc
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    [self installTextStub:self.installTextStubSwitch];
+    [self installImageStub:self.installImageStubSwitch];
+    [OHHTTPStubs onStubActivation:^(NSURLRequest *request, id<OHHTTPStubsDescriptor> stub) {
+        NSLog(@"[OHHTTPStubs] Request to %@ has been stubbed with %@", request.URL, stub.name);
+    }];
+}
+- (void)viewDidUnload
+{
+    [self setTextView:nil];
+    [self setImageView:nil];
+    [self setDelaySwitch:nil];
+    [super viewDidUnload];
+}
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Global stubs activation
+
+- (IBAction)toggleStubs:(UISwitch *)sender
+{
+    [OHHTTPStubs setEnabled:sender.on];
+    self.delaySwitch.enabled = sender.on;
+    self.installTextStubSwitch.enabled = sender.on;
+    self.installImageStubSwitch.enabled = sender.on;
+    
+    NSLog(@"Installed (%@) stubs: %@", (sender.on?@"and enabled":@"but disabled"), OHHTTPStubs.allStubs);
+}
+
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Text Download and Stub
+
+
+- (IBAction)downloadText:(UIButton*)sender
+{
+    sender.enabled = NO;
+    self.textView.text = nil;
+
+    NSString* urlString = @"http://www.opensource.apple.com/source/Git/Git-26/src/git-htmldocs/git-commit.txt?txt";
+    NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:urlString]];
+    
+    // This is a very handy way to send an asynchronous method, but only available in iOS5+
+    [NSURLConnection sendAsynchronousRequest:req
+                                       queue:[NSOperationQueue mainQueue]
+                           completionHandler:^(NSURLResponse* resp, NSData* data, NSError* error)
+     {
+         sender.enabled = YES;
+         NSString* receivedText = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding];
+         self.textView.text = receivedText;
+     }];
+}
+
+
+
+
+- (IBAction)installTextStub:(UISwitch *)sender
+{
+    static id<OHHTTPStubsDescriptor> textStub = nil; // Note: no need to retain this value, it is retained by the OHHTTPStubs itself already
+    if (sender.on)
+    {
+        // Install
+        textStub = [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+            // This stub will only configure stub requests for "*.txt" files
+            return [request.URL.pathExtension isEqualToString:@"txt"];
+        } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+            // Stub txt files with this
+            return [[OHHTTPStubsResponse responseWithFileAtPath:OHPathForFile(@"stub.txt", self.class)
+                                                     statusCode:200
+                                                        headers:@{@"Content-Type":@"text/plain"}]
+                    requestTime:self.delaySwitch.on ? 2.f: 0.f
+                    responseTime:OHHTTPStubsDownloadSpeedWifi];
+        }];
+        textStub.name = @"Text stub";
+    }
+    else
+    {
+        // Uninstall
+        [OHHTTPStubs removeStub:textStub];
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Image Download and Stub
+
+- (IBAction)downloadImage:(UIButton*)sender
+{
+    sender.enabled = NO;
+    
+    NSString* urlString = @"http://images.apple.com/support/assets/images/products/iphone/hero_iphone4-5_wide.png";
+    NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:urlString]];
+    
+    // This is a very handy way to send an asynchronous method, but only available in iOS5+
+    [NSURLConnection sendAsynchronousRequest:req
+                                       queue:[NSOperationQueue mainQueue]
+                           completionHandler:^(NSURLResponse* resp, NSData* data, NSError* error)
+     {
+         sender.enabled = YES;
+         self.imageView.image = [UIImage imageWithData:data];
+     }];
+}
+
+- (IBAction)installImageStub:(UISwitch *)sender
+{
+    static id<OHHTTPStubsDescriptor> imageStub = nil; // Note: no need to retain this value, it is retained by the OHHTTPStubs itself already :)
+    if (sender.on)
+    {
+        // Install
+        imageStub = [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+            // This stub will only configure stub requests for "*.png" files
+            return [request.URL.pathExtension isEqualToString:@"png"];
+        } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+            // Stub jpg files with this
+            return [[OHHTTPStubsResponse responseWithFileAtPath:OHPathForFile(@"stub.jpg", self.class)
+                                                     statusCode:200
+                                                        headers:@{@"Content-Type":@"image/jpeg"}]
+                    requestTime:self.delaySwitch.on ? 2.f: 0.f
+                    responseTime:OHHTTPStubsDownloadSpeedWifi];
+        }];
+        imageStub.name = @"Image stub";
+    }
+    else
+    {
+        // Uninstall
+        [OHHTTPStubs removeStub:imageStub];
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Cleaning
+
+- (IBAction)clearResults
+{
+    self.textView.text = @"";
+    self.imageView.image = nil;
+}
+
+@end
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/MainViewController.xib b/test/ios/OHHTTPStubs/Examples/ObjC/MainViewController.xib
new file mode 100644
index 000000000..bab95b860
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/MainViewController.xib
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="4510" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+    <dependencies>
+        <deployment defaultVersion="1072" identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="UIApplication"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <window opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" visibleAtLaunch="YES" id="20">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+            <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
+            <connections>
+                <outlet property="rootViewController" destination="21" id="22"/>
+            </connections>
+        </window>
+        <viewController id="21" customClass="MainViewController">
+            <view key="view" contentMode="scaleToFill" id="1">
+                <rect key="frame" x="0.0" y="0.0" width="320" height="560"/>
+                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                <subviews>
+                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Activate Stubs Globally" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="7">
+                        <rect key="frame" x="20" y="40" width="177" height="21"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <switch opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" id="5">
+                        <rect key="frame" x="246" y="37" width="51" height="31"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                        <connections>
+                            <action selector="toggleStubs:" destination="21" eventType="valueChanged" id="23"/>
+                        </connections>
+                    </switch>
+                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Fake 2s Delay" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="15">
+                        <rect key="frame" x="20" y="75" width="109" height="21"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <switch opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" id="17">
+                        <rect key="frame" x="144" y="72" width="51" height="31"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    </switch>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="29">
+                        <rect key="frame" x="231" y="69" width="69" height="35"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                        <state key="normal" title="Clear">
+                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                        </state>
+                        <connections>
+                            <action selector="clearResults" destination="21" eventType="touchUpInside" id="31"/>
+                        </connections>
+                    </button>
+                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" id="6">
+                        <rect key="frame" x="20" y="170" width="280" height="188"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="0.89892221719999998" alpha="1" colorSpace="calibratedWhite"/>
+                        <fontDescription key="fontDescription" name="Menlo-Regular" family="Menlo" pointSize="12"/>
+                        <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                    </textView>
+                    <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" id="9">
+                        <rect key="frame" x="20" y="425" width="280" height="115"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                        <color key="backgroundColor" white="0.89892221719999998" alpha="1" colorSpace="calibratedWhite"/>
+                    </imageView>
+                    <view contentMode="scaleToFill" id="56B-Sg-JRy">
+                        <rect key="frame" x="20" y="366" width="280" height="55"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                        <subviews>
+                            <switch opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" id="Llz-IP-qMB">
+                                <rect key="frame" x="224" y="20" width="51" height="31"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                                <connections>
+                                    <action selector="installImageStub:" destination="21" eventType="valueChanged" id="l07-IE-Bbh"/>
+                                </connections>
+                            </switch>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Stub installed?" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" adjustsFontSizeToFit="NO" id="44">
+                                <rect key="frame" x="201" y="0.0" width="79" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="9"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="8">
+                                <rect key="frame" x="0.0" y="9" width="176" height="37"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                                <state key="normal" title="Download image">
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <state key="disabled" title="Downloading…">
+                                    <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <connections>
+                                    <action selector="downloadImage:" destination="21" eventType="touchUpInside" id="33"/>
+                                </connections>
+                            </button>
+                        </subviews>
+                        <color key="backgroundColor" white="0.94548357664233584" alpha="1" colorSpace="calibratedWhite"/>
+                    </view>
+                    <view contentMode="scaleToFill" id="P7g-mD-orR">
+                        <rect key="frame" x="20" y="111" width="280" height="55"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="4">
+                                <rect key="frame" x="0.0" y="9" width="176" height="37"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                                <state key="normal" title="Download some text">
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <state key="disabled" title="Downloading…">
+                                    <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <connections>
+                                    <action selector="downloadText:" destination="21" eventType="touchUpInside" id="32"/>
+                                </connections>
+                            </button>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Stub installed?" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" adjustsFontSizeToFit="NO" id="43">
+                                <rect key="frame" x="201" y="0.0" width="79" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="9"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <switch opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" id="41">
+                                <rect key="frame" x="224" y="20" width="51" height="31"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                                <connections>
+                                    <action selector="installTextStub:" destination="21" eventType="valueChanged" id="45"/>
+                                </connections>
+                            </switch>
+                        </subviews>
+                        <color key="backgroundColor" white="0.94548357664233584" alpha="1" colorSpace="calibratedWhite"/>
+                    </view>
+                </subviews>
+                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
+            </view>
+            <extendedEdge key="edgesForExtendedLayout"/>
+            <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
+            <nil key="simulatedTopBarMetrics"/>
+            <nil key="simulatedBottomBarMetrics"/>
+            <simulatedOrientationMetrics key="simulatedOrientationMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="delaySwitch" destination="17" id="26"/>
+                <outlet property="imageView" destination="9" id="25"/>
+                <outlet property="installImageStubSwitch" destination="Llz-IP-qMB" id="BDS-xd-SzF"/>
+                <outlet property="installTextStubSwitch" destination="41" id="47"/>
+                <outlet property="textView" destination="6" id="24"/>
+            </connections>
+        </viewController>
+    </objects>
+</document>
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcodeproj/project.pbxproj b/test/ios/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcodeproj/project.pbxproj
new file mode 100644
index 000000000..a342a5ec9
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcodeproj/project.pbxproj
@@ -0,0 +1,382 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		0984831517805426002A99FF /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0984831417805426002A99FF /* CFNetwork.framework */; };
+		098FBDD415D704E800623941 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 098FBDD315D704E800623941 /* UIKit.framework */; };
+		098FBDD615D704E800623941 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 098FBDD515D704E800623941 /* Foundation.framework */; };
+		098FBDD815D704E800623941 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 098FBDD715D704E800623941 /* CoreGraphics.framework */; };
+		098FBDE015D704E800623941 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 098FBDDF15D704E800623941 /* main.m */; };
+		098FBDED15D7056200623941 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 098FBDEB15D7056200623941 /* MainViewController.m */; };
+		098FBDEE15D7056200623941 /* MainViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 098FBDEC15D7056200623941 /* MainViewController.xib */; };
+		098FBDF815D70E2600623941 /* stub.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 098FBDF615D70E2600623941 /* stub.jpg */; };
+		098FBDF915D70E2600623941 /* stub.txt in Resources */ = {isa = PBXBuildFile; fileRef = 098FBDF715D70E2600623941 /* stub.txt */; };
+		099C7343169016D800239880 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 099C7342169016D800239880 /* Default-568h@2x.png */; };
+		76C30541E2A1B24B6848F032 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1B8BA1C0EA8F8EC24B9024E1 /* libPods.a */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		0984831417805426002A99FF /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
+		098FBDCF15D704E800623941 /* OHHTTPStubsDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OHHTTPStubsDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		098FBDD315D704E800623941 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
+		098FBDD515D704E800623941 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		098FBDD715D704E800623941 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
+		098FBDDB15D704E800623941 /* OHHTTPStubsDemo-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "OHHTTPStubsDemo-Info.plist"; sourceTree = "<group>"; };
+		098FBDDF15D704E800623941 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		098FBDE115D704E800623941 /* OHHTTPStubsDemo-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OHHTTPStubsDemo-Prefix.pch"; sourceTree = "<group>"; };
+		098FBDEA15D7056200623941 /* MainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainViewController.h; sourceTree = "<group>"; };
+		098FBDEB15D7056200623941 /* MainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainViewController.m; sourceTree = "<group>"; };
+		098FBDEC15D7056200623941 /* MainViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainViewController.xib; sourceTree = "<group>"; };
+		098FBDF615D70E2600623941 /* stub.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = stub.jpg; sourceTree = "<group>"; };
+		098FBDF715D70E2600623941 /* stub.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = stub.txt; sourceTree = "<group>"; };
+		099C7342169016D800239880 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
+		0EE81E095FF3A8AF6D3C4E77 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
+		1B8BA1C0EA8F8EC24B9024E1 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		48556A011AA6E9FD0074B154 /* libPods-OHHTTPStubs.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libPods-OHHTTPStubs.a"; path = "Pods/../build/Debug-iphoneos/libPods-OHHTTPStubs.a"; sourceTree = "<group>"; };
+		B5AD292FAB98FC9C7637896A /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		098FBDCC15D704E800623941 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				0984831517805426002A99FF /* CFNetwork.framework in Frameworks */,
+				098FBDD415D704E800623941 /* UIKit.framework in Frameworks */,
+				098FBDD615D704E800623941 /* Foundation.framework in Frameworks */,
+				098FBDD815D704E800623941 /* CoreGraphics.framework in Frameworks */,
+				76C30541E2A1B24B6848F032 /* libPods.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		098FBDC415D704E800623941 = {
+			isa = PBXGroup;
+			children = (
+				098FBDD915D704E800623941 /* OHHTTPStubsDemo */,
+				098FBDD215D704E800623941 /* Frameworks */,
+				098FBDD015D704E800623941 /* Products */,
+				DBC538A23E8B9FD8D58D30B1 /* Pods */,
+			);
+			sourceTree = "<group>";
+		};
+		098FBDD015D704E800623941 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				098FBDCF15D704E800623941 /* OHHTTPStubsDemo.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		098FBDD215D704E800623941 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				48556A011AA6E9FD0074B154 /* libPods-OHHTTPStubs.a */,
+				0984831417805426002A99FF /* CFNetwork.framework */,
+				098FBDD315D704E800623941 /* UIKit.framework */,
+				098FBDD515D704E800623941 /* Foundation.framework */,
+				098FBDD715D704E800623941 /* CoreGraphics.framework */,
+				1B8BA1C0EA8F8EC24B9024E1 /* libPods.a */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		098FBDD915D704E800623941 /* OHHTTPStubsDemo */ = {
+			isa = PBXGroup;
+			children = (
+				098FBDEA15D7056200623941 /* MainViewController.h */,
+				098FBDEB15D7056200623941 /* MainViewController.m */,
+				098FBDEC15D7056200623941 /* MainViewController.xib */,
+				098FBDFA15D70E2F00623941 /* Stubs */,
+				098FBDDA15D704E800623941 /* Supporting Files */,
+			);
+			name = OHHTTPStubsDemo;
+			sourceTree = "<group>";
+		};
+		098FBDDA15D704E800623941 /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				099C7342169016D800239880 /* Default-568h@2x.png */,
+				098FBDDB15D704E800623941 /* OHHTTPStubsDemo-Info.plist */,
+				098FBDDF15D704E800623941 /* main.m */,
+				098FBDE115D704E800623941 /* OHHTTPStubsDemo-Prefix.pch */,
+			);
+			path = "Supporting Files";
+			sourceTree = "<group>";
+		};
+		098FBDFA15D70E2F00623941 /* Stubs */ = {
+			isa = PBXGroup;
+			children = (
+				098FBDF615D70E2600623941 /* stub.jpg */,
+				098FBDF715D70E2600623941 /* stub.txt */,
+			);
+			path = Stubs;
+			sourceTree = "<group>";
+		};
+		DBC538A23E8B9FD8D58D30B1 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				B5AD292FAB98FC9C7637896A /* Pods.debug.xcconfig */,
+				0EE81E095FF3A8AF6D3C4E77 /* Pods.release.xcconfig */,
+			);
+			name = Pods;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		098FBDCE15D704E800623941 /* OHHTTPStubsDemo */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 098FBDE715D704E800623941 /* Build configuration list for PBXNativeTarget "OHHTTPStubsDemo" */;
+			buildPhases = (
+				5BF07CD1F1DEB3893534CA6D /* Check Pods Manifest.lock */,
+				098FBDCB15D704E800623941 /* Sources */,
+				098FBDCC15D704E800623941 /* Frameworks */,
+				098FBDCD15D704E800623941 /* Resources */,
+				D61C918AA467A72C9C508B4E /* Copy Pods Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = OHHTTPStubsDemo;
+			productName = OHHTTPStubsDemo;
+			productReference = 098FBDCF15D704E800623941 /* OHHTTPStubsDemo.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		098FBDC615D704E800623941 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0630;
+				ORGANIZATIONNAME = AliSoftware;
+			};
+			buildConfigurationList = 098FBDC915D704E800623941 /* Build configuration list for PBXProject "OHHTTPStubsDemo" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 098FBDC415D704E800623941;
+			productRefGroup = 098FBDD015D704E800623941 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				098FBDCE15D704E800623941 /* OHHTTPStubsDemo */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		098FBDCD15D704E800623941 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				098FBDEE15D7056200623941 /* MainViewController.xib in Resources */,
+				098FBDF815D70E2600623941 /* stub.jpg in Resources */,
+				098FBDF915D70E2600623941 /* stub.txt in Resources */,
+				099C7343169016D800239880 /* Default-568h@2x.png in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		5BF07CD1F1DEB3893534CA6D /* Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Check Pods Manifest.lock";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
+			showEnvVarsInLog = 0;
+		};
+		D61C918AA467A72C9C508B4E /* Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Copy Pods Resources";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		098FBDCB15D704E800623941 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				098FBDE015D704E800623941 /* main.m in Sources */,
+				098FBDED15D7056200623941 /* MainViewController.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		098FBDE515D704E800623941 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
+				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
+				GCC_WARN_SHADOW = YES;
+				GCC_WARN_SIGN_COMPARE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNKNOWN_PRAGMAS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = "-ObjC";
+				SDKROOT = iphoneos;
+			};
+			name = Debug;
+		};
+		098FBDE615D704E800623941 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = YES;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
+				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
+				GCC_WARN_SHADOW = YES;
+				GCC_WARN_SIGN_COMPARE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNKNOWN_PRAGMAS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
+				OTHER_LDFLAGS = "-ObjC";
+				SDKROOT = iphoneos;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		098FBDE815D704E800623941 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = B5AD292FAB98FC9C7637896A /* Pods.debug.xcconfig */;
+			buildSettings = {
+				CLANG_ENABLE_OBJC_ARC = YES;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "Supporting Files/OHHTTPStubsDemo-Prefix.pch";
+				INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/OHHTTPStubsDemo-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				WRAPPER_EXTENSION = app;
+			};
+			name = Debug;
+		};
+		098FBDE915D704E800623941 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 0EE81E095FF3A8AF6D3C4E77 /* Pods.release.xcconfig */;
+			buildSettings = {
+				CLANG_ENABLE_OBJC_ARC = YES;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "Supporting Files/OHHTTPStubsDemo-Prefix.pch";
+				INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/OHHTTPStubsDemo-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				WRAPPER_EXTENSION = app;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		098FBDC915D704E800623941 /* Build configuration list for PBXProject "OHHTTPStubsDemo" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				098FBDE515D704E800623941 /* Debug */,
+				098FBDE615D704E800623941 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		098FBDE715D704E800623941 /* Build configuration list for PBXNativeTarget "OHHTTPStubsDemo" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				098FBDE815D704E800623941 /* Debug */,
+				098FBDE915D704E800623941 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 098FBDC615D704E800623941 /* Project object */;
+}
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/test/ios/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 000000000..68ace104d
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:OHHTTPStubsDemo.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS Demo.xcscheme b/test/ios/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS Demo.xcscheme
new file mode 100644
index 000000000..41f5f1bbc
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS Demo.xcscheme	
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0630"
+   version = "2.0">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "NO"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "098FBDCE15D704E800623941"
+               BuildableName = "OHHTTPStubsDemo.app"
+               BlueprintName = "OHHTTPStubsDemo"
+               ReferencedContainer = "container:OHHTTPStubsDemo.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "09110A5019805F4800D175E4"
+               BuildableName = "OHHTTPStubs iOS Tests.xctest"
+               BlueprintName = "OHHTTPStubs iOS Tests"
+               ReferencedContainer = "container:../OHHTTPStubs/OHHTTPStubs.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "09110A5019805F4800D175E4"
+               BuildableName = "OHHTTPStubs iOS Tests.xctest"
+               BlueprintName = "OHHTTPStubs iOS Tests"
+               ReferencedContainer = "container:../OHHTTPStubs/OHHTTPStubs.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "098FBDCE15D704E800623941"
+            BuildableName = "OHHTTPStubsDemo.app"
+            BlueprintName = "OHHTTPStubsDemo"
+            ReferencedContainer = "container:OHHTTPStubsDemo.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugXPCServices = "NO"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "098FBDCE15D704E800623941"
+            BuildableName = "OHHTTPStubsDemo.app"
+            BlueprintName = "OHHTTPStubsDemo"
+            ReferencedContainer = "container:OHHTTPStubsDemo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "098FBDCE15D704E800623941"
+            BuildableName = "OHHTTPStubsDemo.app"
+            BlueprintName = "OHHTTPStubsDemo"
+            ReferencedContainer = "container:OHHTTPStubsDemo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcworkspace/contents.xcworkspacedata b/test/ios/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 000000000..cfc0e73f1
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:OHHTTPStubsDemo.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Podfile b/test/ios/OHHTTPStubs/Examples/ObjC/Podfile
new file mode 100644
index 000000000..30504595e
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Podfile
@@ -0,0 +1,6 @@
+source 'https://github.com/CocoaPods/Specs.git'
+
+xcodeproj 'OHHTTPStubsDemo.xcodeproj'
+platform :ios, '6.0'
+
+pod 'OHHTTPStubs', :path => '../..'
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Podfile.lock b/test/ios/OHHTTPStubs/Examples/ObjC/Podfile.lock
new file mode 100644
index 000000000..8192540ce
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Podfile.lock
@@ -0,0 +1,14 @@
+PODS:
+  - OHHTTPStubs (4.0.1)
+
+DEPENDENCIES:
+  - OHHTTPStubs (from `../..`)
+
+EXTERNAL SOURCES:
+  OHHTTPStubs:
+    :path: "../.."
+
+SPEC CHECKSUMS:
+  OHHTTPStubs: 69b1d48b7dfe838a355fdf48d8592d1042e3d85f
+
+COCOAPODS: 0.37.0
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubs.h b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubs.h
new file mode 120000
index 000000000..e466a3093
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubs.h
@@ -0,0 +1 @@
+../../../../../../OHHTTPStubs/Sources/OHHTTPStubs.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h
new file mode 120000
index 000000000..55a0a6a46
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h
@@ -0,0 +1 @@
+../../../../../../OHHTTPStubs/Sources/OHHTTPStubsResponse+HTTPMessage.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+JSON.h b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+JSON.h
new file mode 120000
index 000000000..247257b1d
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+JSON.h
@@ -0,0 +1 @@
+../../../../../../OHHTTPStubs/Sources/OHHTTPStubsResponse+JSON.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse.h b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse.h
new file mode 120000
index 000000000..773f3f322
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse.h
@@ -0,0 +1 @@
+../../../../../../OHHTTPStubs/Sources/OHHTTPStubsResponse.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHPathHelpers.h b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHPathHelpers.h
new file mode 120000
index 000000000..6a6273c69
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHPathHelpers.h
@@ -0,0 +1 @@
+../../../../../../OHHTTPStubs/Sources/OHPathHelpers.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubs.h b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubs.h
new file mode 120000
index 000000000..e466a3093
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubs.h
@@ -0,0 +1 @@
+../../../../../../OHHTTPStubs/Sources/OHHTTPStubs.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h
new file mode 120000
index 000000000..55a0a6a46
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h
@@ -0,0 +1 @@
+../../../../../../OHHTTPStubs/Sources/OHHTTPStubsResponse+HTTPMessage.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+JSON.h b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+JSON.h
new file mode 120000
index 000000000..247257b1d
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+JSON.h
@@ -0,0 +1 @@
+../../../../../../OHHTTPStubs/Sources/OHHTTPStubsResponse+JSON.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse.h b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse.h
new file mode 120000
index 000000000..773f3f322
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse.h
@@ -0,0 +1 @@
+../../../../../../OHHTTPStubs/Sources/OHHTTPStubsResponse.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHPathHelpers.h b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHPathHelpers.h
new file mode 120000
index 000000000..6a6273c69
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHPathHelpers.h
@@ -0,0 +1 @@
+../../../../../../OHHTTPStubs/Sources/OHPathHelpers.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Local Podspecs/OHHTTPStubs.podspec.json b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Local Podspecs/OHHTTPStubs.podspec.json
new file mode 100644
index 000000000..3be5f2250
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Local Podspecs/OHHTTPStubs.podspec.json	
@@ -0,0 +1,26 @@
+{
+  "name": "OHHTTPStubs",
+  "version": "4.0.1",
+  "summary": "Framework to stub your network requests like HTTP and help you write network unit tests with XCTest.",
+  "description": "A class to stub network requests easily:\n\n * Test your apps with fake network data (stubbed from file)\n * You can also customize your response headers and status code\n * Use customized stubs depending on the requests\n * Use custom response time to simulate slow network.\n * This works with any request (HTTP, HTTPS, or any protocol) sent using\n   the iOS URL Loading System (NSURLConnection, NSURLSession, AFNetworking, …)\n * This is really useful in unit testing, when you need to test network features\n   but don't want to hit the real network and fake some response data instead.\n * Has useful convenience methods to stub JSON content or fixture from a file\n * Compatible with Swift\n",
+  "homepage": "https://github.com/AliSoftware/OHHTTPStubs",
+  "license": "MIT",
+  "authors": {
+    "Olivier Halligon": "olivier.halligon+ae@gmail.com"
+  },
+  "source": {
+    "git": "https://github.com/AliSoftware/OHHTTPStubs.git",
+    "tag": "4.0.1"
+  },
+  "source_files": "OHHTTPStubs/Sources/*.{h,m}",
+  "public_header_files": "OHHTTPStubs/Sources/*.h",
+  "frameworks": [
+    "Foundation",
+    "CFNetwork"
+  ],
+  "requires_arc": true,
+  "platforms": {
+    "ios": "5.0",
+    "osx": "10.7"
+  }
+}
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Manifest.lock b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Manifest.lock
new file mode 100644
index 000000000..8192540ce
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Manifest.lock
@@ -0,0 +1,14 @@
+PODS:
+  - OHHTTPStubs (4.0.1)
+
+DEPENDENCIES:
+  - OHHTTPStubs (from `../..`)
+
+EXTERNAL SOURCES:
+  OHHTTPStubs:
+    :path: "../.."
+
+SPEC CHECKSUMS:
+  OHHTTPStubs: 69b1d48b7dfe838a355fdf48d8592d1042e3d85f
+
+COCOAPODS: 0.37.0
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Pods.xcodeproj/project.pbxproj b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Pods.xcodeproj/project.pbxproj
new file mode 100644
index 000000000..9ac1e1973
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Pods.xcodeproj/project.pbxproj
@@ -0,0 +1,488 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		0287B0995D3956A77FE8245B /* Pods-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = F22C8E5911B3A17469606575 /* Pods-dummy.m */; };
+		05AF8AC740672A49F1DB86F8 /* OHPathHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 8AB4DCEA3E6E205F6150BB9B /* OHPathHelpers.h */; };
+		37E8EFCB93409F59A3519709 /* OHHTTPStubsResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 64DE90B81CB54898D8031417 /* OHHTTPStubsResponse.h */; };
+		3C4E450E5248FA162C4836BB /* OHHTTPStubsResponse+JSON.m in Sources */ = {isa = PBXBuildFile; fileRef = 43DA39110509B5D077268FC8 /* OHHTTPStubsResponse+JSON.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		4C169F633246281BE747CBC7 /* OHHTTPStubsResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = BB8B9FD03923F20EA8A5A11A /* OHHTTPStubsResponse.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		5FAAE71C0DC019D177F03852 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B2C23953AEE92A8924B57BD /* Foundation.framework */; };
+		91AC7870E73F1D4AFD355954 /* OHHTTPStubsResponse+HTTPMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = CD10D9BE097DF051073D1136 /* OHHTTPStubsResponse+HTTPMessage.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		91F20FAEB508489E6E82A37E /* Pods-OHHTTPStubs-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = C9D0A204842A77405B1B4826 /* Pods-OHHTTPStubs-dummy.m */; };
+		B1DBEB199B89B0F2534AB372 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E3F78A40A045AD979FC32D66 /* CFNetwork.framework */; };
+		B3F948D4C6FEA3E3414304E3 /* OHHTTPStubsResponse+JSON.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F1C78DC9C9ED126B2DD803F /* OHHTTPStubsResponse+JSON.h */; };
+		B5A13025620A2BC7F9523B3E /* OHPathHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 91CB751631C441AC78BFFF91 /* OHPathHelpers.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		B88B2F8C9696F7AFF1219FA6 /* OHHTTPStubs+NSURLSessionConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 90C538A641602D6CA84175EA /* OHHTTPStubs+NSURLSessionConfiguration.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		C73743AF5192A2BCAD0BA639 /* OHHTTPStubs.m in Sources */ = {isa = PBXBuildFile; fileRef = 757741D337827989EA9CFB35 /* OHHTTPStubs.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		D6D12CC401BBCC3846765533 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B2C23953AEE92A8924B57BD /* Foundation.framework */; };
+		DDE78ABCE16D42E4E3347D57 /* OHHTTPStubs.h in Headers */ = {isa = PBXBuildFile; fileRef = F59CD3981590122479A99319 /* OHHTTPStubs.h */; };
+		E93E7222A109F4DE8DEE1C8A /* OHHTTPStubsResponse+HTTPMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 26BD78083C121EBF426395FC /* OHHTTPStubsResponse+HTTPMessage.h */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		70209F8E12151BE9099A0906 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 4E43A3978191CB163B56150F /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 9BFA25996D607CC8407D9667;
+			remoteInfo = "Pods-OHHTTPStubs";
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXFileReference section */
+		1F1C78DC9C9ED126B2DD803F /* OHHTTPStubsResponse+JSON.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OHHTTPStubsResponse+JSON.h"; sourceTree = "<group>"; };
+		26BD78083C121EBF426395FC /* OHHTTPStubsResponse+HTTPMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OHHTTPStubsResponse+HTTPMessage.h"; sourceTree = "<group>"; };
+		43DA39110509B5D077268FC8 /* OHHTTPStubsResponse+JSON.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "OHHTTPStubsResponse+JSON.m"; sourceTree = "<group>"; };
+		51D2E996FA1B199219C88105 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		540BE0121862CF47DF5EAC7E /* Pods-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-acknowledgements.plist"; sourceTree = "<group>"; };
+		5CAE31F1B62C6CE71BC12572 /* Pods-OHHTTPStubs-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-OHHTTPStubs-prefix.pch"; sourceTree = "<group>"; };
+		64DE90B81CB54898D8031417 /* OHHTTPStubsResponse.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OHHTTPStubsResponse.h; sourceTree = "<group>"; };
+		757741D337827989EA9CFB35 /* OHHTTPStubs.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OHHTTPStubs.m; sourceTree = "<group>"; };
+		7A817F08BCB2651ACDF06BAF /* Pods-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-resources.sh"; sourceTree = "<group>"; };
+		7B2C23953AEE92A8924B57BD /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
+		7F0BAB562664206098AE3E43 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Pods.debug.xcconfig; sourceTree = "<group>"; };
+		85434260BFFB3C7A7BC04F99 /* Pods-environment.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-environment.h"; sourceTree = "<group>"; };
+		8AB4DCEA3E6E205F6150BB9B /* OHPathHelpers.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OHPathHelpers.h; sourceTree = "<group>"; };
+		90C538A641602D6CA84175EA /* OHHTTPStubs+NSURLSessionConfiguration.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "OHHTTPStubs+NSURLSessionConfiguration.m"; sourceTree = "<group>"; };
+		91CB751631C441AC78BFFF91 /* OHPathHelpers.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OHPathHelpers.m; sourceTree = "<group>"; };
+		925D0F1AA2487470D449CE49 /* Pods-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-acknowledgements.markdown"; sourceTree = "<group>"; };
+		95AC8CA1C533FBB6BD437ACB /* Podfile */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
+		A1BA020EDD8BB7AE11152ACC /* Pods-OHHTTPStubs.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-OHHTTPStubs.xcconfig"; sourceTree = "<group>"; };
+		A976A0F9BBC8019FB5DD5B7F /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Pods.release.xcconfig; sourceTree = "<group>"; };
+		BB8B9FD03923F20EA8A5A11A /* OHHTTPStubsResponse.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OHHTTPStubsResponse.m; sourceTree = "<group>"; };
+		C9D0A204842A77405B1B4826 /* Pods-OHHTTPStubs-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-OHHTTPStubs-dummy.m"; sourceTree = "<group>"; };
+		CD10D9BE097DF051073D1136 /* OHHTTPStubsResponse+HTTPMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "OHHTTPStubsResponse+HTTPMessage.m"; sourceTree = "<group>"; };
+		DBFCAD5C4AF069800133DA37 /* Pods-OHHTTPStubs-Private.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-OHHTTPStubs-Private.xcconfig"; sourceTree = "<group>"; };
+		DD8EC89EDDE25D7B79665F29 /* libPods-OHHTTPStubs.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OHHTTPStubs.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		E3F78A40A045AD979FC32D66 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/CFNetwork.framework; sourceTree = DEVELOPER_DIR; };
+		F22C8E5911B3A17469606575 /* Pods-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-dummy.m"; sourceTree = "<group>"; };
+		F59CD3981590122479A99319 /* OHHTTPStubs.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OHHTTPStubs.h; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		370CE9976B2CE6DC38C7AD35 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				B1DBEB199B89B0F2534AB372 /* CFNetwork.framework in Frameworks */,
+				D6D12CC401BBCC3846765533 /* Foundation.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		8F733C40CCF846B63AED7A63 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				5FAAE71C0DC019D177F03852 /* Foundation.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		262D783B60DE608266D6A656 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				51D2E996FA1B199219C88105 /* libPods.a */,
+				DD8EC89EDDE25D7B79665F29 /* libPods-OHHTTPStubs.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		2D13680F87CE7E9F973E18D6 /* Targets Support Files */ = {
+			isa = PBXGroup;
+			children = (
+				D8918EE34F24A086FB93B162 /* Pods */,
+			);
+			name = "Targets Support Files";
+			sourceTree = "<group>";
+		};
+		3EB198ABE93CBAE1C25569ED /* OHHTTPStubs */ = {
+			isa = PBXGroup;
+			children = (
+				C4B29A11FCEF09243EA85BD4 /* OHHTTPStubs */,
+				D882BE8B7A1CD1ACAD41FC23 /* Support Files */,
+			);
+			name = OHHTTPStubs;
+			path = ../../..;
+			sourceTree = "<group>";
+		};
+		4CCC5CCCC482E8248CF90F91 = {
+			isa = PBXGroup;
+			children = (
+				95AC8CA1C533FBB6BD437ACB /* Podfile */,
+				A6534AD5BD03EA29AB460479 /* Development Pods */,
+				90091CD0A828ED346DE8663C /* Frameworks */,
+				262D783B60DE608266D6A656 /* Products */,
+				2D13680F87CE7E9F973E18D6 /* Targets Support Files */,
+			);
+			sourceTree = "<group>";
+		};
+		6B5292DC8591159D72E93366 /* Sources */ = {
+			isa = PBXGroup;
+			children = (
+				F59CD3981590122479A99319 /* OHHTTPStubs.h */,
+				757741D337827989EA9CFB35 /* OHHTTPStubs.m */,
+				90C538A641602D6CA84175EA /* OHHTTPStubs+NSURLSessionConfiguration.m */,
+				64DE90B81CB54898D8031417 /* OHHTTPStubsResponse.h */,
+				BB8B9FD03923F20EA8A5A11A /* OHHTTPStubsResponse.m */,
+				26BD78083C121EBF426395FC /* OHHTTPStubsResponse+HTTPMessage.h */,
+				CD10D9BE097DF051073D1136 /* OHHTTPStubsResponse+HTTPMessage.m */,
+				1F1C78DC9C9ED126B2DD803F /* OHHTTPStubsResponse+JSON.h */,
+				43DA39110509B5D077268FC8 /* OHHTTPStubsResponse+JSON.m */,
+				8AB4DCEA3E6E205F6150BB9B /* OHPathHelpers.h */,
+				91CB751631C441AC78BFFF91 /* OHPathHelpers.m */,
+			);
+			path = Sources;
+			sourceTree = "<group>";
+		};
+		90091CD0A828ED346DE8663C /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				D39958F9C841183DE3C7A500 /* iOS */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		A6534AD5BD03EA29AB460479 /* Development Pods */ = {
+			isa = PBXGroup;
+			children = (
+				3EB198ABE93CBAE1C25569ED /* OHHTTPStubs */,
+			);
+			name = "Development Pods";
+			sourceTree = "<group>";
+		};
+		C4B29A11FCEF09243EA85BD4 /* OHHTTPStubs */ = {
+			isa = PBXGroup;
+			children = (
+				6B5292DC8591159D72E93366 /* Sources */,
+			);
+			path = OHHTTPStubs;
+			sourceTree = "<group>";
+		};
+		D39958F9C841183DE3C7A500 /* iOS */ = {
+			isa = PBXGroup;
+			children = (
+				E3F78A40A045AD979FC32D66 /* CFNetwork.framework */,
+				7B2C23953AEE92A8924B57BD /* Foundation.framework */,
+			);
+			name = iOS;
+			sourceTree = "<group>";
+		};
+		D882BE8B7A1CD1ACAD41FC23 /* Support Files */ = {
+			isa = PBXGroup;
+			children = (
+				A1BA020EDD8BB7AE11152ACC /* Pods-OHHTTPStubs.xcconfig */,
+				DBFCAD5C4AF069800133DA37 /* Pods-OHHTTPStubs-Private.xcconfig */,
+				C9D0A204842A77405B1B4826 /* Pods-OHHTTPStubs-dummy.m */,
+				5CAE31F1B62C6CE71BC12572 /* Pods-OHHTTPStubs-prefix.pch */,
+			);
+			name = "Support Files";
+			path = "Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs";
+			sourceTree = "<group>";
+		};
+		D8918EE34F24A086FB93B162 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				925D0F1AA2487470D449CE49 /* Pods-acknowledgements.markdown */,
+				540BE0121862CF47DF5EAC7E /* Pods-acknowledgements.plist */,
+				F22C8E5911B3A17469606575 /* Pods-dummy.m */,
+				85434260BFFB3C7A7BC04F99 /* Pods-environment.h */,
+				7A817F08BCB2651ACDF06BAF /* Pods-resources.sh */,
+				7F0BAB562664206098AE3E43 /* Pods.debug.xcconfig */,
+				A976A0F9BBC8019FB5DD5B7F /* Pods.release.xcconfig */,
+			);
+			name = Pods;
+			path = "Target Support Files/Pods";
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		F9ECAC25D98304B8B72AF50A /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				DDE78ABCE16D42E4E3347D57 /* OHHTTPStubs.h in Headers */,
+				E93E7222A109F4DE8DEE1C8A /* OHHTTPStubsResponse+HTTPMessage.h in Headers */,
+				B3F948D4C6FEA3E3414304E3 /* OHHTTPStubsResponse+JSON.h in Headers */,
+				37E8EFCB93409F59A3519709 /* OHHTTPStubsResponse.h in Headers */,
+				05AF8AC740672A49F1DB86F8 /* OHPathHelpers.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		9BFA25996D607CC8407D9667 /* Pods-OHHTTPStubs */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 99C679F5F4E67D87EC4BDF5A /* Build configuration list for PBXNativeTarget "Pods-OHHTTPStubs" */;
+			buildPhases = (
+				BE02003453F6728BF5A57B70 /* Sources */,
+				370CE9976B2CE6DC38C7AD35 /* Frameworks */,
+				F9ECAC25D98304B8B72AF50A /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "Pods-OHHTTPStubs";
+			productName = "Pods-OHHTTPStubs";
+			productReference = DD8EC89EDDE25D7B79665F29 /* libPods-OHHTTPStubs.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+		ED0986E9CFBAA34FCF4971C9 /* Pods */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 40030A743EB9FB86643D5978 /* Build configuration list for PBXNativeTarget "Pods" */;
+			buildPhases = (
+				222D0A79B1499A9F0B3FDA4B /* Sources */,
+				8F733C40CCF846B63AED7A63 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				76788543FE7378BD74B08A8D /* PBXTargetDependency */,
+			);
+			name = Pods;
+			productName = Pods;
+			productReference = 51D2E996FA1B199219C88105 /* libPods.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		4E43A3978191CB163B56150F /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0640;
+			};
+			buildConfigurationList = A6F781DF7CB4BC20838676BB /* Build configuration list for PBXProject "Pods" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 4CCC5CCCC482E8248CF90F91;
+			productRefGroup = 262D783B60DE608266D6A656 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				ED0986E9CFBAA34FCF4971C9 /* Pods */,
+				9BFA25996D607CC8407D9667 /* Pods-OHHTTPStubs */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		222D0A79B1499A9F0B3FDA4B /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				0287B0995D3956A77FE8245B /* Pods-dummy.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		BE02003453F6728BF5A57B70 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				B88B2F8C9696F7AFF1219FA6 /* OHHTTPStubs+NSURLSessionConfiguration.m in Sources */,
+				C73743AF5192A2BCAD0BA639 /* OHHTTPStubs.m in Sources */,
+				91AC7870E73F1D4AFD355954 /* OHHTTPStubsResponse+HTTPMessage.m in Sources */,
+				3C4E450E5248FA162C4836BB /* OHHTTPStubsResponse+JSON.m in Sources */,
+				4C169F633246281BE747CBC7 /* OHHTTPStubsResponse.m in Sources */,
+				B5A13025620A2BC7F9523B3E /* OHPathHelpers.m in Sources */,
+				91F20FAEB508489E6E82A37E /* Pods-OHHTTPStubs-dummy.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		76788543FE7378BD74B08A8D /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = "Pods-OHHTTPStubs";
+			target = 9BFA25996D607CC8407D9667 /* Pods-OHHTTPStubs */;
+			targetProxy = 70209F8E12151BE9099A0906 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin XCBuildConfiguration section */
+		337E89F82BC61A2DD3C2E883 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = A976A0F9BBC8019FB5DD5B7F /* Pods.release.xcconfig */;
+			buildSettings = {
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+			};
+			name = Release;
+		};
+		63360606759F06BB75622084 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DBFCAD5C4AF069800133DA37 /* Pods-OHHTTPStubs-Private.xcconfig */;
+			buildSettings = {
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_PREFIX_HEADER = "Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-prefix.pch";
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+			};
+			name = Release;
+		};
+		68471B2F01E99F601F6F8AC3 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				ONLY_ACTIVE_ARCH = YES;
+				STRIP_INSTALLED_PRODUCT = NO;
+				SYMROOT = "${SRCROOT}/../build";
+			};
+			name = Debug;
+		};
+		6B84606278B52C10D43487F2 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DBFCAD5C4AF069800133DA37 /* Pods-OHHTTPStubs-Private.xcconfig */;
+			buildSettings = {
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_PREFIX_HEADER = "Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-prefix.pch";
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+			};
+			name = Debug;
+		};
+		7DBF91DE1049E44BD8E62530 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7F0BAB562664206098AE3E43 /* Pods.debug.xcconfig */;
+			buildSettings = {
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+			};
+			name = Debug;
+		};
+		F0A06905E42C5AED58002639 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = YES;
+				ENABLE_NS_ASSERTIONS = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_PREPROCESSOR_DEFINITIONS = "RELEASE=1";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				STRIP_INSTALLED_PRODUCT = NO;
+				SYMROOT = "${SRCROOT}/../build";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		40030A743EB9FB86643D5978 /* Build configuration list for PBXNativeTarget "Pods" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				7DBF91DE1049E44BD8E62530 /* Debug */,
+				337E89F82BC61A2DD3C2E883 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		99C679F5F4E67D87EC4BDF5A /* Build configuration list for PBXNativeTarget "Pods-OHHTTPStubs" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				6B84606278B52C10D43487F2 /* Debug */,
+				63360606759F06BB75622084 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		A6F781DF7CB4BC20838676BB /* Build configuration list for PBXProject "Pods" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				68471B2F01E99F601F6F8AC3 /* Debug */,
+				F0A06905E42C5AED58002639 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 4E43A3978191CB163B56150F /* Project object */;
+}
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-Private.xcconfig b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-Private.xcconfig
new file mode 100644
index 000000000..8fb40d2e9
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-Private.xcconfig	
@@ -0,0 +1,6 @@
+#include "Pods-OHHTTPStubs.xcconfig"
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/OHHTTPStubs" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/OHHTTPStubs"
+OTHER_LDFLAGS = ${PODS_OHHTTPSTUBS_OTHER_LDFLAGS} -ObjC
+PODS_ROOT = ${SRCROOT}
+SKIP_INSTALL = YES
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-dummy.m b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-dummy.m
new file mode 100644
index 000000000..6e93a65cc
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-dummy.m	
@@ -0,0 +1,5 @@
+#import <Foundation/Foundation.h>
+@interface PodsDummy_Pods_OHHTTPStubs : NSObject
+@end
+@implementation PodsDummy_Pods_OHHTTPStubs
+@end
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-prefix.pch b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-prefix.pch
new file mode 100644
index 000000000..95cf11d9f
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-prefix.pch	
@@ -0,0 +1,5 @@
+#ifdef __OBJC__
+#import <UIKit/UIKit.h>
+#endif
+
+#import "Pods-environment.h"
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs.xcconfig b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs.xcconfig
new file mode 100644
index 000000000..de1d241ad
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs.xcconfig	
@@ -0,0 +1 @@
+PODS_OHHTTPSTUBS_OTHER_LDFLAGS = -framework "CFNetwork" -framework "Foundation"
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown
new file mode 100644
index 000000000..79d3603ad
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown	
@@ -0,0 +1,15 @@
+# Acknowledgements
+This application makes use of the following third party libraries:
+
+## OHHTTPStubs
+
+- MIT LICENSE -
+
+Copyright (c) 2012 Olivier Halligon
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Generated by CocoaPods - http://cocoapods.org
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-acknowledgements.plist b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-acknowledgements.plist
new file mode 100644
index 000000000..756aa4392
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-acknowledgements.plist	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreferenceSpecifiers</key>
+	<array>
+		<dict>
+			<key>FooterText</key>
+			<string>This application makes use of the following third party libraries:</string>
+			<key>Title</key>
+			<string>Acknowledgements</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>- MIT LICENSE -
+
+Copyright (c) 2012 Olivier Halligon
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</string>
+			<key>Title</key>
+			<string>OHHTTPStubs</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>Generated by CocoaPods - http://cocoapods.org</string>
+			<key>Title</key>
+			<string></string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+	</array>
+	<key>StringsTable</key>
+	<string>Acknowledgements</string>
+	<key>Title</key>
+	<string>Acknowledgements</string>
+</dict>
+</plist>
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-dummy.m b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-dummy.m
new file mode 100644
index 000000000..ade64bd1a
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-dummy.m	
@@ -0,0 +1,5 @@
+#import <Foundation/Foundation.h>
+@interface PodsDummy_Pods : NSObject
+@end
+@implementation PodsDummy_Pods
+@end
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-environment.h b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-environment.h
new file mode 100644
index 000000000..5918510c4
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-environment.h	
@@ -0,0 +1,14 @@
+
+// To check if a library is compiled with CocoaPods you
+// can use the `COCOAPODS` macro definition which is
+// defined in the xcconfigs so it is available in
+// headers also when they are imported in the client
+// project.
+
+
+// OHHTTPStubs
+#define COCOAPODS_POD_AVAILABLE_OHHTTPStubs
+#define COCOAPODS_VERSION_MAJOR_OHHTTPStubs 4
+#define COCOAPODS_VERSION_MINOR_OHHTTPStubs 0
+#define COCOAPODS_VERSION_PATCH_OHHTTPStubs 1
+
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-resources.sh b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-resources.sh
new file mode 100755
index 000000000..43f08523e
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-resources.sh	
@@ -0,0 +1,93 @@
+#!/bin/sh
+set -e
+
+mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+
+RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
+> "$RESOURCES_TO_COPY"
+
+XCASSET_FILES=()
+
+realpath() {
+  DIRECTORY=$(cd "${1%/*}" && pwd)
+  FILENAME="${1##*/}"
+  echo "$DIRECTORY/$FILENAME"
+}
+
+install_resource()
+{
+  case $1 in
+    *.storyboard)
+      echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc ${PODS_ROOT}/$1 --sdk ${SDKROOT}"
+      ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc" "${PODS_ROOT}/$1" --sdk "${SDKROOT}"
+      ;;
+    *.xib)
+        echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib ${PODS_ROOT}/$1 --sdk ${SDKROOT}"
+      ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib" "${PODS_ROOT}/$1" --sdk "${SDKROOT}"
+      ;;
+    *.framework)
+      echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      echo "rsync -av ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      rsync -av "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      ;;
+    *.xcdatamodel)
+      echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1"`.mom\""
+      xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodel`.mom"
+      ;;
+    *.xcdatamodeld)
+      echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd\""
+      xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd"
+      ;;
+    *.xcmappingmodel)
+      echo "xcrun mapc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm\""
+      xcrun mapc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm"
+      ;;
+    *.xcassets)
+      ABSOLUTE_XCASSET_FILE=$(realpath "${PODS_ROOT}/$1")
+      XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
+      ;;
+    /*)
+      echo "$1"
+      echo "$1" >> "$RESOURCES_TO_COPY"
+      ;;
+    *)
+      echo "${PODS_ROOT}/$1"
+      echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY"
+      ;;
+  esac
+}
+
+rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+if [[ "${ACTION}" == "install" ]]; then
+  rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+fi
+rm -f "$RESOURCES_TO_COPY"
+
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
+then
+  case "${TARGETED_DEVICE_FAMILY}" in
+    1,2)
+      TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
+      ;;
+    1)
+      TARGET_DEVICE_ARGS="--target-device iphone"
+      ;;
+    2)
+      TARGET_DEVICE_ARGS="--target-device ipad"
+      ;;
+    *)
+      TARGET_DEVICE_ARGS="--target-device mac"
+      ;;
+  esac
+
+  # Find all other xcassets (this unfortunately includes those of path pods and other targets).
+  OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
+  while read line; do
+    if [[ $line != "`realpath $PODS_ROOT`*" ]]; then
+      XCASSET_FILES+=("$line")
+    fi
+  done <<<"$OTHER_XCASSETS"
+
+  printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${IPHONEOS_DEPLOYMENT_TARGET}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+fi
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods.debug.xcconfig b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods.debug.xcconfig
new file mode 100644
index 000000000..806e7917f
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods.debug.xcconfig	
@@ -0,0 +1,6 @@
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/OHHTTPStubs"
+OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/OHHTTPStubs"
+OTHER_LDFLAGS = $(inherited) -ObjC -l"Pods-OHHTTPStubs" -framework "CFNetwork" -framework "Foundation"
+OTHER_LIBTOOLFLAGS = $(OTHER_LDFLAGS)
+PODS_ROOT = ${SRCROOT}/Pods
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods.release.xcconfig b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods.release.xcconfig
new file mode 100644
index 000000000..806e7917f
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods.release.xcconfig	
@@ -0,0 +1,6 @@
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/OHHTTPStubs"
+OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/OHHTTPStubs"
+OTHER_LDFLAGS = $(inherited) -ObjC -l"Pods-OHHTTPStubs" -framework "CFNetwork" -framework "Foundation"
+OTHER_LIBTOOLFLAGS = $(OTHER_LDFLAGS)
+PODS_ROOT = ${SRCROOT}/Pods
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Stubs/stub.jpg b/test/ios/OHHTTPStubs/Examples/ObjC/Stubs/stub.jpg
new file mode 100644
index 000000000..c42a21cd7
Binary files /dev/null and b/test/ios/OHHTTPStubs/Examples/ObjC/Stubs/stub.jpg differ
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Stubs/stub.txt b/test/ios/OHHTTPStubs/Examples/ObjC/Stubs/stub.txt
new file mode 100644
index 000000000..e662f91b2
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Stubs/stub.txt
@@ -0,0 +1,3 @@
+This is the text from your stub.
+
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diem nonummy nibh euismod tincidunt ut lacreet dolore magna aliguam erat volutpat. Ut wisis enim ad minim veniam, quis nostrud exerci tution ullam corper suscipit lobortis nisi ut aliquip ex ea commodo consequat. Duis te feugi facilisi. Duis autem dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit au gue duis dolore te feugat nulla facilisi.
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Supporting Files/Default-568h@2x.png b/test/ios/OHHTTPStubs/Examples/ObjC/Supporting Files/Default-568h@2x.png
new file mode 100644
index 000000000..0891b7aab
Binary files /dev/null and b/test/ios/OHHTTPStubs/Examples/ObjC/Supporting Files/Default-568h@2x.png differ
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Supporting Files/OHHTTPStubsDemo-Info.plist b/test/ios/OHHTTPStubs/Examples/ObjC/Supporting Files/OHHTTPStubsDemo-Info.plist
new file mode 100644
index 000000000..5dc7a4773
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Supporting Files/OHHTTPStubsDemo-Info.plist	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.alisoftware.${PRODUCT_NAME:rfc1034identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>NSMainNibFile</key>
+	<string>MainViewController</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Supporting Files/OHHTTPStubsDemo-Prefix.pch b/test/ios/OHHTTPStubs/Examples/ObjC/Supporting Files/OHHTTPStubsDemo-Prefix.pch
new file mode 100644
index 000000000..20ef71978
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Supporting Files/OHHTTPStubsDemo-Prefix.pch	
@@ -0,0 +1,14 @@
+//
+// Prefix header for all source files of the 'OHHTTPStubsDemo' target in the 'OHHTTPStubsDemo' project
+//
+
+#import <Availability.h>
+
+#ifndef __IPHONE_3_0
+#warning "This project uses features only available in iOS SDK 3.0 and later."
+#endif
+
+#ifdef __OBJC__
+    #import <UIKit/UIKit.h>
+    #import <Foundation/Foundation.h>
+#endif
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Supporting Files/main.m b/test/ios/OHHTTPStubs/Examples/ObjC/Supporting Files/main.m
new file mode 100644
index 000000000..478bfb395
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/ObjC/Supporting Files/main.m	
@@ -0,0 +1,17 @@
+//
+//  main.m
+//  OHHTTPStubsDemo
+//
+//  Created by Olivier Halligon on 11/08/12.
+//  Copyright (c) 2012 AliSoftware. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+
+int main(int argc, char *argv[])
+{
+    @autoreleasepool {
+        return UIApplicationMain(argc, argv, nil, nil);
+    }
+}
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/AppDelegate.swift b/test/ios/OHHTTPStubs/Examples/Swift/AppDelegate.swift
new file mode 100644
index 000000000..58f489a7d
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/AppDelegate.swift
@@ -0,0 +1,21 @@
+//
+//  AppDelegate.swift
+//  OHHTTPStubsDemo
+//
+//  Created by Olivier Halligon on 18/04/2015.
+//  Copyright (c) 2015 AliSoftware. All rights reserved.
+//
+
+import UIKit
+
+@UIApplicationMain
+class AppDelegate: UIResponder, UIApplicationDelegate {
+
+    var window: UIWindow?
+
+    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+        // Override point for customization after application launch.
+        return true
+    }
+}
+
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Main.storyboard b/test/ios/OHHTTPStubs/Examples/Swift/Main.storyboard
new file mode 100644
index 000000000..438521ca5
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Main.storyboard
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7531" systemVersion="14C1514" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7520"/>
+        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+    </dependencies>
+    <scenes>
+        <!--Main View Controller-->
+        <scene sceneID="tne-QT-ifu">
+            <objects>
+                <viewController id="BYZ-38-t0r" customClass="MainViewController" customModule="OHHTTPStubsDemo" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
+                        <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Activate Stubs Globally" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="i3Q-pZ-OFi">
+                                <rect key="frame" x="73" y="33" width="511" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" horizontalCompressionResistancePriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="l60-ZM-CS7">
+                                <rect key="frame" x="16" y="28" width="51" height="31"/>
+                                <connections>
+                                    <action selector="toggleStubs:" destination="BYZ-38-t0r" eventType="valueChanged" id="Ab8-ba-nES"/>
+                                </connections>
+                            </switch>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Fake 2s Delay" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="BVp-fP-EX3">
+                                <rect key="frame" x="73" y="72" width="434" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" horizontalCompressionResistancePriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="Ots-uz-HBP">
+                                <rect key="frame" x="16" y="67" width="51" height="31"/>
+                            </switch>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Bd2-S0-6oU">
+                                <rect key="frame" x="515" y="68" width="69" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="69" id="05U-TI-0b3"/>
+                                </constraints>
+                                <state key="normal" title="Clear">
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <connections>
+                                    <action selector="clearResults" destination="BYZ-38-t0r" eventType="touchUpInside" id="aLh-6y-PPp"/>
+                                </connections>
+                            </button>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="q0d-yd-8pd">
+                                <rect key="frame" x="16" y="106" width="568" height="55"/>
+                                <subviews>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cHe-gS-w8n">
+                                        <rect key="frame" x="13" y="5" width="481" height="45"/>
+                                        <state key="normal" title="Download some text">
+                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                        </state>
+                                        <state key="disabled" title="Downloading…">
+                                            <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                                        </state>
+                                        <connections>
+                                            <action selector="downloadText:" destination="BYZ-38-t0r" eventType="touchUpInside" id="HfU-ap-tEC"/>
+                                        </connections>
+                                    </button>
+                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="750" verticalHuggingPriority="750" text="Stub installed?" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CZL-1L-SlS">
+                                        <rect key="frame" x="485" y="2" width="63" height="20"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="9"/>
+                                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="1000" verticalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="eja-cQ-oUU">
+                                        <rect key="frame" x="499" y="22" width="51" height="31"/>
+                                        <connections>
+                                            <action selector="installTextStub:" destination="BYZ-38-t0r" eventType="valueChanged" id="2pl-wJ-iCQ"/>
+                                        </connections>
+                                    </switch>
+                                </subviews>
+                                <color key="backgroundColor" white="0.94548357660000004" alpha="1" colorSpace="calibratedWhite"/>
+                                <constraints>
+                                    <constraint firstAttribute="bottom" secondItem="eja-cQ-oUU" secondAttribute="bottom" constant="2" id="29H-MG-Fxf"/>
+                                    <constraint firstItem="eja-cQ-oUU" firstAttribute="top" secondItem="CZL-1L-SlS" secondAttribute="bottom" id="3wI-sk-26n"/>
+                                    <constraint firstItem="cHe-gS-w8n" firstAttribute="leading" secondItem="q0d-yd-8pd" secondAttribute="leadingMargin" constant="5" id="Hwa-qe-ZOQ"/>
+                                    <constraint firstAttribute="trailing" secondItem="eja-cQ-oUU" secondAttribute="trailing" constant="20" symbolic="YES" id="Khb-si-DNH"/>
+                                    <constraint firstAttribute="bottom" secondItem="cHe-gS-w8n" secondAttribute="bottom" constant="5" id="S92-MO-7X2"/>
+                                    <constraint firstItem="cHe-gS-w8n" firstAttribute="top" secondItem="q0d-yd-8pd" secondAttribute="top" constant="5" id="bbu-UH-GkB"/>
+                                    <constraint firstItem="eja-cQ-oUU" firstAttribute="leading" secondItem="cHe-gS-w8n" secondAttribute="trailing" constant="5" id="gjH-jS-L0Y"/>
+                                    <constraint firstItem="CZL-1L-SlS" firstAttribute="trailing" secondItem="eja-cQ-oUU" secondAttribute="trailing" id="p7j-wp-ICC"/>
+                                    <constraint firstAttribute="height" constant="55" id="qXE-il-74X"/>
+                                    <constraint firstAttribute="trailing" secondItem="CZL-1L-SlS" secondAttribute="trailing" constant="8" id="rgi-Il-D0e"/>
+                                    <constraint firstItem="CZL-1L-SlS" firstAttribute="top" secondItem="q0d-yd-8pd" secondAttribute="top" constant="2" id="wN6-Rr-Qrd"/>
+                                </constraints>
+                                <variation key="default">
+                                    <mask key="constraints">
+                                        <exclude reference="rgi-Il-D0e"/>
+                                    </mask>
+                                </variation>
+                            </view>
+                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ruy-AH-zcs">
+                                <rect key="frame" x="16" y="169" width="568" height="176"/>
+                                <color key="backgroundColor" white="0.89892221719999998" alpha="1" colorSpace="calibratedWhite"/>
+                                <fontDescription key="fontDescription" name="Menlo-Regular" family="Menlo" pointSize="12"/>
+                                <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                            </textView>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GvE-e2-Eos">
+                                <rect key="frame" x="16" y="353" width="568" height="55"/>
+                                <subviews>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="c9w-hC-ZIo">
+                                        <rect key="frame" x="13" y="5" width="478" height="45"/>
+                                        <state key="normal" title="Download image">
+                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                        </state>
+                                        <state key="disabled" title="Downloading…">
+                                            <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                                        </state>
+                                        <connections>
+                                            <action selector="downloadImage:" destination="BYZ-38-t0r" eventType="touchUpInside" id="UM4-Du-Bbb"/>
+                                        </connections>
+                                    </button>
+                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="1000" verticalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ji5-SF-Rck">
+                                        <rect key="frame" x="499" y="22" width="51" height="31"/>
+                                        <connections>
+                                            <action selector="installImageStub:" destination="BYZ-38-t0r" eventType="valueChanged" id="B56-KR-Iwy"/>
+                                        </connections>
+                                    </switch>
+                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Stub installed?" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WaM-eo-B4Y">
+                                        <rect key="frame" x="485" y="2" width="63" height="20"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="9"/>
+                                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                                <color key="backgroundColor" white="0.94548357660000004" alpha="1" colorSpace="calibratedWhite"/>
+                                <constraints>
+                                    <constraint firstItem="ji5-SF-Rck" firstAttribute="top" secondItem="WaM-eo-B4Y" secondAttribute="bottom" id="4ga-4o-xtr"/>
+                                    <constraint firstItem="c9w-hC-ZIo" firstAttribute="top" secondItem="GvE-e2-Eos" secondAttribute="top" constant="5" id="62E-jh-E4B"/>
+                                    <constraint firstItem="ji5-SF-Rck" firstAttribute="leading" secondItem="c9w-hC-ZIo" secondAttribute="trailing" constant="8" symbolic="YES" id="8lX-bA-JCe"/>
+                                    <constraint firstItem="c9w-hC-ZIo" firstAttribute="leading" secondItem="GvE-e2-Eos" secondAttribute="leadingMargin" constant="5" id="Dyb-rO-JJU"/>
+                                    <constraint firstAttribute="trailing" secondItem="ji5-SF-Rck" secondAttribute="trailing" constant="20" symbolic="YES" id="Fkp-ob-fLN"/>
+                                    <constraint firstAttribute="bottom" secondItem="ji5-SF-Rck" secondAttribute="bottom" constant="2" id="R9M-DJ-mIm"/>
+                                    <constraint firstAttribute="height" constant="55" id="Ro0-sY-nDW"/>
+                                    <constraint firstItem="WaM-eo-B4Y" firstAttribute="trailing" secondItem="ji5-SF-Rck" secondAttribute="trailing" id="ZxJ-2X-ePH"/>
+                                    <constraint firstAttribute="bottom" secondItem="c9w-hC-ZIo" secondAttribute="bottom" constant="5" id="jdz-li-ys1"/>
+                                    <constraint firstItem="WaM-eo-B4Y" firstAttribute="top" secondItem="GvE-e2-Eos" secondAttribute="top" constant="2" id="zDu-Go-F4N"/>
+                                </constraints>
+                            </view>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" translatesAutoresizingMaskIntoConstraints="NO" id="5bj-Tq-WCZ">
+                                <rect key="frame" x="16" y="416" width="568" height="176"/>
+                                <color key="backgroundColor" white="0.89892221719999998" alpha="1" colorSpace="calibratedWhite"/>
+                            </imageView>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstItem="l60-ZM-CS7" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leadingMargin" id="0j5-Kr-Bap"/>
+                            <constraint firstItem="GvE-e2-Eos" firstAttribute="trailing" secondItem="8bC-Xf-vdC" secondAttribute="trailingMargin" id="7BB-yF-NDN"/>
+                            <constraint firstItem="5bj-Tq-WCZ" firstAttribute="height" secondItem="ruy-AH-zcs" secondAttribute="height" id="9CM-a2-1St"/>
+                            <constraint firstItem="Ots-uz-HBP" firstAttribute="top" secondItem="l60-ZM-CS7" secondAttribute="bottom" constant="8" symbolic="YES" id="9fP-Fh-cY6"/>
+                            <constraint firstItem="Ots-uz-HBP" firstAttribute="centerY" secondItem="BVp-fP-EX3" secondAttribute="centerY" id="CuV-xq-bsL"/>
+                            <constraint firstItem="ruy-AH-zcs" firstAttribute="top" secondItem="q0d-yd-8pd" secondAttribute="bottom" constant="8" symbolic="YES" id="FAU-LK-lwH"/>
+                            <constraint firstAttribute="trailingMargin" secondItem="i3Q-pZ-OFi" secondAttribute="trailing" id="Gf3-KX-gvo"/>
+                            <constraint firstItem="ruy-AH-zcs" firstAttribute="trailing" secondItem="8bC-Xf-vdC" secondAttribute="trailingMargin" id="GwN-Yl-Oe9"/>
+                            <constraint firstItem="q0d-yd-8pd" firstAttribute="top" secondItem="Ots-uz-HBP" secondAttribute="bottom" constant="8" symbolic="YES" id="Hte-At-iUc"/>
+                            <constraint firstItem="5bj-Tq-WCZ" firstAttribute="top" secondItem="GvE-e2-Eos" secondAttribute="bottom" constant="8" symbolic="YES" id="JgY-aI-yDT"/>
+                            <constraint firstItem="GvE-e2-Eos" firstAttribute="top" secondItem="ruy-AH-zcs" secondAttribute="bottom" constant="8" symbolic="YES" id="Ote-kU-oyl"/>
+                            <constraint firstItem="l60-ZM-CS7" firstAttribute="top" secondItem="y3c-jy-aDJ" secondAttribute="bottom" constant="8" symbolic="YES" id="QcO-T9-cgv"/>
+                            <constraint firstItem="Bd2-S0-6oU" firstAttribute="trailing" secondItem="8bC-Xf-vdC" secondAttribute="trailingMargin" id="SC7-du-hgz"/>
+                            <constraint firstItem="Bd2-S0-6oU" firstAttribute="leading" secondItem="BVp-fP-EX3" secondAttribute="trailing" constant="8" symbolic="YES" id="UId-jY-PGT"/>
+                            <constraint firstItem="BVp-fP-EX3" firstAttribute="leading" secondItem="Ots-uz-HBP" secondAttribute="trailing" constant="8" symbolic="YES" id="YtW-MD-2HS"/>
+                            <constraint firstItem="Ots-uz-HBP" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leadingMargin" id="YzH-tR-2EL"/>
+                            <constraint firstItem="wfy-db-euE" firstAttribute="top" secondItem="5bj-Tq-WCZ" secondAttribute="bottom" constant="8" symbolic="YES" id="bkX-5L-yHb"/>
+                            <constraint firstItem="GvE-e2-Eos" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leadingMargin" id="e3m-dD-QHe"/>
+                            <constraint firstItem="q0d-yd-8pd" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leadingMargin" id="gf8-4V-OtZ"/>
+                            <constraint firstItem="i3Q-pZ-OFi" firstAttribute="centerY" secondItem="l60-ZM-CS7" secondAttribute="centerY" id="i7p-Mu-Z5w"/>
+                            <constraint firstItem="Bd2-S0-6oU" firstAttribute="centerY" secondItem="BVp-fP-EX3" secondAttribute="centerY" id="lBr-er-U9M"/>
+                            <constraint firstItem="5bj-Tq-WCZ" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leadingMargin" id="n85-Qw-ILn"/>
+                            <constraint firstItem="ruy-AH-zcs" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leadingMargin" id="t7w-mv-dbP"/>
+                            <constraint firstItem="i3Q-pZ-OFi" firstAttribute="leading" secondItem="l60-ZM-CS7" secondAttribute="trailing" constant="8" symbolic="YES" id="ud7-J3-llm"/>
+                            <constraint firstItem="q0d-yd-8pd" firstAttribute="trailing" secondItem="8bC-Xf-vdC" secondAttribute="trailingMargin" id="vd3-vh-cO6"/>
+                            <constraint firstItem="5bj-Tq-WCZ" firstAttribute="trailing" secondItem="8bC-Xf-vdC" secondAttribute="trailingMargin" id="zf9-6C-GJh"/>
+                        </constraints>
+                    </view>
+                    <connections>
+                        <outlet property="delaySwitch" destination="Ots-uz-HBP" id="bye-pT-jxJ"/>
+                        <outlet property="imageView" destination="5bj-Tq-WCZ" id="u02-Ml-Ob8"/>
+                        <outlet property="installImageStubSwitch" destination="ji5-SF-Rck" id="7u3-ya-Crs"/>
+                        <outlet property="installTextStubSwitch" destination="eja-cQ-oUU" id="Xsi-sG-ivV"/>
+                        <outlet property="textView" destination="ruy-AH-zcs" id="Gbh-p5-mVt"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
+            </objects>
+        </scene>
+    </scenes>
+</document>
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/MainViewController.swift b/test/ios/OHHTTPStubs/Examples/Swift/MainViewController.swift
new file mode 100644
index 000000000..e983f11f3
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/MainViewController.swift
@@ -0,0 +1,145 @@
+//
+//  ViewController.swift
+//  OHHTTPStubsDemo
+//
+//  Created by Olivier Halligon on 18/04/2015.
+//  Copyright (c) 2015 AliSoftware. All rights reserved.
+//
+
+import UIKit
+import OHHTTPStubs
+
+class MainViewController: UIViewController {
+
+    ////////////////////////////////////////////////////////////////////////////////
+    // MARK: - Outlets
+    
+    @IBOutlet var delaySwitch: UISwitch!
+    @IBOutlet var textView: UITextView!
+    @IBOutlet var installTextStubSwitch: UISwitch!
+    @IBOutlet var imageView: UIImageView!
+    @IBOutlet var installImageStubSwitch: UISwitch!
+
+    ////////////////////////////////////////////////////////////////////////////////
+    // MARK: - Init & Dealloc
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        installTextStub(self.installTextStubSwitch)
+        installImageStub(self.installImageStubSwitch)
+        OHHTTPStubs.onStubActivation { (request: NSURLRequest!, stub: OHHTTPStubsDescriptor!) in
+            println("[OHHTTPStubs] Request to \(request.URL!) has been stubbed with \(stub.name)")
+        }
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////
+    // MARK: - Global stubs activation
+
+    @IBAction func toggleStubs(sender: UISwitch) {
+        OHHTTPStubs.setEnabled(sender.on)
+        self.delaySwitch.enabled = sender.on
+        self.installTextStubSwitch.enabled = sender.on
+        self.installImageStubSwitch.enabled = sender.on
+        
+        let state = sender.on ? "and enabled" : "but disabled"
+        println("Installed (\(state)) stubs: \(OHHTTPStubs.allStubs)")
+    }
+    
+
+    
+    ////////////////////////////////////////////////////////////////////////////////
+    // MARK: - Text Download and Stub
+    
+    
+    @IBAction func downloadText(sender: UIButton) {
+        sender.enabled = false
+        self.textView.text = nil
+        
+        let urlString = "http://www.opensource.apple.com/source/Git/Git-26/src/git-htmldocs/git-commit.txt?txt"
+        let req = NSURLRequest(URL: NSURL(string: urlString)!)
+
+        NSURLConnection.sendAsynchronousRequest(req, queue: NSOperationQueue.mainQueue()) { (_, data, _) in
+            sender.enabled = true
+            let receivedText = NSString(data: data, encoding: NSASCIIStringEncoding)
+            self.textView.text = receivedText! as String
+        }
+    }
+
+    weak var textStub: OHHTTPStubsDescriptor?
+    @IBAction func installTextStub(sender: UISwitch) {
+        if sender.on {
+            // Install
+
+            // - we use an inline closure for the test predicate with shorthand argument names
+            // - we also use the "trailing closure" syntax of Swift for convenience
+            // - we don't care about the 'request' parameter in the trailing closure so we use '_'
+            textStub = OHHTTPStubs.stubRequestsPassingTest({$0.URL!.pathExtension == "txt"}) { _ in
+                let stubPath = OHPathForFile("stub.txt", self.dynamicType)
+                return OHHTTPStubsResponse(
+                    fileAtPath: stubPath!,
+                    statusCode: 200,
+                    headers: ["Content-Type":"text/plain"]
+                    )
+                    .requestTime(self.delaySwitch.on ? 2.0 : 0.0, responseTime:OHHTTPStubsDownloadSpeedWifi)
+            }
+            textStub?.name = "Text stub"
+        } else {
+            // Uninstall
+            OHHTTPStubs.removeStub(textStub!)
+        }
+    }
+    
+    
+    ////////////////////////////////////////////////////////////////////////////////
+    // MARK: - Image Download and Stub
+    
+    @IBAction func downloadImage(sender: UIButton) {
+        sender.enabled = false
+        self.imageView.image = nil
+
+        let urlString = "http://images.apple.com/support/assets/images/products/iphone/hero_iphone4-5_wide.png"
+        let req = NSURLRequest(URL: NSURL(string: urlString)!)
+
+        NSURLConnection.sendAsynchronousRequest(req, queue: NSOperationQueue.mainQueue()) { (_, data, _) in
+            sender.enabled = true
+            self.imageView.image = UIImage(data: data)
+        }
+    }
+    
+    weak var imageStub: OHHTTPStubsDescriptor?
+    @IBAction func installImageStub(sender: UISwitch) {
+        if sender.on {
+            // Install
+            
+            let isImage = { (request: NSURLRequest!) -> Bool in
+                contains(["png","jpg","jpeg","gif"], request.URL?.pathExtension ?? "")
+            }
+            // - we use a separate block 'isImage' for the 'test' predicate for code readability
+            // - we use the "trailing closure" syntax of Swift for convenience
+            // - we don't care about the 'request' parameter in the trailing closure so we use '_'
+            imageStub = OHHTTPStubs.stubRequestsPassingTest(isImage) { _ in
+                let stubPath = OHPathForFile("stub.jpg", self.dynamicType)
+                return OHHTTPStubsResponse(
+                    fileAtPath: stubPath!,
+                    statusCode: 200,
+                    headers: ["Content-Type":"image/jpeg"]
+                    )
+                    .requestTime(self.delaySwitch.on ? 2.0 : 0.0, responseTime: OHHTTPStubsDownloadSpeedWifi)
+            }
+            imageStub?.name = "Image stub"
+        } else {
+            // Uninstall
+            OHHTTPStubs.removeStub(imageStub!)
+        }
+    }
+    
+    ////////////////////////////////////////////////////////////////////////////////
+    // MARK: - Cleaning
+    
+    @IBAction func clearResults() {
+        self.textView.text = ""
+        self.imageView.image = nil
+    }
+    
+}
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcodeproj/project.pbxproj b/test/ios/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcodeproj/project.pbxproj
new file mode 100644
index 000000000..49d0a3d76
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcodeproj/project.pbxproj
@@ -0,0 +1,378 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		099F74141AE2D049001108A5 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 099F74131AE2D049001108A5 /* Images.xcassets */; };
+		099F742F1AE2D572001108A5 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 099F742D1AE2D572001108A5 /* Main.storyboard */; };
+		099F74351AE2D5EB001108A5 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 099F74341AE2D5EB001108A5 /* LaunchScreen.xib */; };
+		099F74391AE2D5FF001108A5 /* stub.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 099F74371AE2D5FF001108A5 /* stub.jpg */; };
+		099F743A1AE2D5FF001108A5 /* stub.txt in Resources */ = {isa = PBXBuildFile; fileRef = 099F74381AE2D5FF001108A5 /* stub.txt */; };
+		099F743C1AE2D632001108A5 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 099F743B1AE2D632001108A5 /* Default-568h@2x.png */; };
+		099F74401AE2D703001108A5 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 099F740E1AE2D049001108A5 /* MainViewController.swift */; };
+		099F74421AE2D7E0001108A5 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 099F74411AE2D7E0001108A5 /* AppDelegate.swift */; };
+		33ABB39721D2012BFC1F5077 /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6C6334E088CD830EF8D38DB /* Pods.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		099F74071AE2D049001108A5 /* OHHTTPStubsDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OHHTTPStubsDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		099F740B1AE2D049001108A5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		099F740E1AE2D049001108A5 /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
+		099F74131AE2D049001108A5 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
+		099F742D1AE2D572001108A5 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
+		099F74341AE2D5EB001108A5 /* LaunchScreen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LaunchScreen.xib; sourceTree = "<group>"; };
+		099F74371AE2D5FF001108A5 /* stub.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = stub.jpg; sourceTree = "<group>"; };
+		099F74381AE2D5FF001108A5 /* stub.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = stub.txt; sourceTree = "<group>"; };
+		099F743B1AE2D632001108A5 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "Supporting Files/Default-568h@2x.png"; sourceTree = SOURCE_ROOT; };
+		099F74411AE2D7E0001108A5 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		D1819A3B2BCA81021164F097 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
+		DC1FF3E7FE2F711D9C9AD066 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
+		F6C6334E088CD830EF8D38DB /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		099F74041AE2D049001108A5 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				33ABB39721D2012BFC1F5077 /* Pods.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		099F73FE1AE2D049001108A5 = {
+			isa = PBXGroup;
+			children = (
+				099F74091AE2D049001108A5 /* OHHTTPStubsDemo */,
+				099F74081AE2D049001108A5 /* Products */,
+				11944CD1D5FC771F513B1E27 /* Pods */,
+				3116686BFC89EEC0587776C7 /* Frameworks */,
+			);
+			sourceTree = "<group>";
+		};
+		099F74081AE2D049001108A5 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				099F74071AE2D049001108A5 /* OHHTTPStubsDemo.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		099F74091AE2D049001108A5 /* OHHTTPStubsDemo */ = {
+			isa = PBXGroup;
+			children = (
+				099F74411AE2D7E0001108A5 /* AppDelegate.swift */,
+				099F740E1AE2D049001108A5 /* MainViewController.swift */,
+				099F742D1AE2D572001108A5 /* Main.storyboard */,
+				099F74361AE2D5FF001108A5 /* Stubs */,
+				099F740A1AE2D049001108A5 /* Supporting Files */,
+			);
+			name = OHHTTPStubsDemo;
+			sourceTree = "<group>";
+		};
+		099F740A1AE2D049001108A5 /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				099F743B1AE2D632001108A5 /* Default-568h@2x.png */,
+				099F74341AE2D5EB001108A5 /* LaunchScreen.xib */,
+				099F74131AE2D049001108A5 /* Images.xcassets */,
+				099F740B1AE2D049001108A5 /* Info.plist */,
+			);
+			path = "Supporting Files";
+			sourceTree = "<group>";
+		};
+		099F74361AE2D5FF001108A5 /* Stubs */ = {
+			isa = PBXGroup;
+			children = (
+				099F74371AE2D5FF001108A5 /* stub.jpg */,
+				099F74381AE2D5FF001108A5 /* stub.txt */,
+			);
+			path = Stubs;
+			sourceTree = "<group>";
+		};
+		11944CD1D5FC771F513B1E27 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				D1819A3B2BCA81021164F097 /* Pods.debug.xcconfig */,
+				DC1FF3E7FE2F711D9C9AD066 /* Pods.release.xcconfig */,
+			);
+			name = Pods;
+			sourceTree = "<group>";
+		};
+		3116686BFC89EEC0587776C7 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				F6C6334E088CD830EF8D38DB /* Pods.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		099F74061AE2D049001108A5 /* OHHTTPStubsDemo */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 099F74261AE2D049001108A5 /* Build configuration list for PBXNativeTarget "OHHTTPStubsDemo" */;
+			buildPhases = (
+				BC9F93D044C7E42A3DAD6455 /* Check Pods Manifest.lock */,
+				099F74031AE2D049001108A5 /* Sources */,
+				099F74041AE2D049001108A5 /* Frameworks */,
+				099F74051AE2D049001108A5 /* Resources */,
+				D95367D5DC075A18A3D27355 /* Embed Pods Frameworks */,
+				5D1017B32E55D59BD180A034 /* Copy Pods Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = OHHTTPStubsDemo;
+			productName = OHHTTPStubsDemo;
+			productReference = 099F74071AE2D049001108A5 /* OHHTTPStubsDemo.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		099F73FF1AE2D049001108A5 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0630;
+				ORGANIZATIONNAME = AliSoftware;
+				TargetAttributes = {
+					099F74061AE2D049001108A5 = {
+						CreatedOnToolsVersion = 6.3;
+					};
+				};
+			};
+			buildConfigurationList = 099F74021AE2D049001108A5 /* Build configuration list for PBXProject "OHHTTPStubsDemo" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 099F73FE1AE2D049001108A5;
+			productRefGroup = 099F74081AE2D049001108A5 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				099F74061AE2D049001108A5 /* OHHTTPStubsDemo */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		099F74051AE2D049001108A5 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				099F74351AE2D5EB001108A5 /* LaunchScreen.xib in Resources */,
+				099F74391AE2D5FF001108A5 /* stub.jpg in Resources */,
+				099F742F1AE2D572001108A5 /* Main.storyboard in Resources */,
+				099F74141AE2D049001108A5 /* Images.xcassets in Resources */,
+				099F743A1AE2D5FF001108A5 /* stub.txt in Resources */,
+				099F743C1AE2D632001108A5 /* Default-568h@2x.png in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		5D1017B32E55D59BD180A034 /* Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Copy Pods Resources";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		BC9F93D044C7E42A3DAD6455 /* Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Check Pods Manifest.lock";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
+			showEnvVarsInLog = 0;
+		};
+		D95367D5DC075A18A3D27355 /* Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Embed Pods Frameworks";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		099F74031AE2D049001108A5 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				099F74421AE2D7E0001108A5 /* AppDelegate.swift in Sources */,
+				099F74401AE2D703001108A5 /* MainViewController.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		099F74241AE2D049001108A5 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		099F74251AE2D049001108A5 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		099F74271AE2D049001108A5 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D1819A3B2BCA81021164F097 /* Pods.debug.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		099F74281AE2D049001108A5 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DC1FF3E7FE2F711D9C9AD066 /* Pods.release.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		099F74021AE2D049001108A5 /* Build configuration list for PBXProject "OHHTTPStubsDemo" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				099F74241AE2D049001108A5 /* Debug */,
+				099F74251AE2D049001108A5 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		099F74261AE2D049001108A5 /* Build configuration list for PBXNativeTarget "OHHTTPStubsDemo" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				099F74271AE2D049001108A5 /* Debug */,
+				099F74281AE2D049001108A5 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 099F73FF1AE2D049001108A5 /* Project object */;
+}
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/test/ios/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 000000000..919434a62
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcodeproj/xcshareddata/xcschemes/OHHTTPStubsDemo.xcscheme b/test/ios/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcodeproj/xcshareddata/xcschemes/OHHTTPStubsDemo.xcscheme
new file mode 100644
index 000000000..a3b4ac68e
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcodeproj/xcshareddata/xcschemes/OHHTTPStubsDemo.xcscheme
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0630"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "099F74061AE2D049001108A5"
+               BuildableName = "OHHTTPStubsDemo.app"
+               BlueprintName = "OHHTTPStubsDemo"
+               ReferencedContainer = "container:OHHTTPStubsDemo.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "099F741B1AE2D049001108A5"
+               BuildableName = "OHHTTPStubsDemoTests.xctest"
+               BlueprintName = "OHHTTPStubsDemoTests"
+               ReferencedContainer = "container:OHHTTPStubsDemo.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "099F741B1AE2D049001108A5"
+               BuildableName = "OHHTTPStubsDemoTests.xctest"
+               BlueprintName = "OHHTTPStubsDemoTests"
+               ReferencedContainer = "container:OHHTTPStubsDemo.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "099F74061AE2D049001108A5"
+            BuildableName = "OHHTTPStubsDemo.app"
+            BlueprintName = "OHHTTPStubsDemo"
+            ReferencedContainer = "container:OHHTTPStubsDemo.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "099F74061AE2D049001108A5"
+            BuildableName = "OHHTTPStubsDemo.app"
+            BlueprintName = "OHHTTPStubsDemo"
+            ReferencedContainer = "container:OHHTTPStubsDemo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "099F74061AE2D049001108A5"
+            BuildableName = "OHHTTPStubsDemo.app"
+            BlueprintName = "OHHTTPStubsDemo"
+            ReferencedContainer = "container:OHHTTPStubsDemo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcworkspace/contents.xcworkspacedata b/test/ios/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 000000000..cfc0e73f1
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:OHHTTPStubsDemo.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Podfile b/test/ios/OHHTTPStubs/Examples/Swift/Podfile
new file mode 100644
index 000000000..a0112f4b2
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Podfile
@@ -0,0 +1,7 @@
+source 'https://github.com/CocoaPods/Specs.git'
+
+xcodeproj 'OHHTTPStubsDemo.xcodeproj'
+platform :ios, '8.0'
+use_frameworks!
+
+pod 'OHHTTPStubs', :path => '../..'
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Podfile.lock b/test/ios/OHHTTPStubs/Examples/Swift/Podfile.lock
new file mode 100644
index 000000000..8192540ce
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Podfile.lock
@@ -0,0 +1,14 @@
+PODS:
+  - OHHTTPStubs (4.0.1)
+
+DEPENDENCIES:
+  - OHHTTPStubs (from `../..`)
+
+EXTERNAL SOURCES:
+  OHHTTPStubs:
+    :path: "../.."
+
+SPEC CHECKSUMS:
+  OHHTTPStubs: 69b1d48b7dfe838a355fdf48d8592d1042e3d85f
+
+COCOAPODS: 0.37.0
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubs.h b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubs.h
new file mode 120000
index 000000000..e466a3093
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubs.h
@@ -0,0 +1 @@
+../../../../../../OHHTTPStubs/Sources/OHHTTPStubs.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h
new file mode 120000
index 000000000..55a0a6a46
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h
@@ -0,0 +1 @@
+../../../../../../OHHTTPStubs/Sources/OHHTTPStubsResponse+HTTPMessage.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+JSON.h b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+JSON.h
new file mode 120000
index 000000000..247257b1d
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+JSON.h
@@ -0,0 +1 @@
+../../../../../../OHHTTPStubs/Sources/OHHTTPStubsResponse+JSON.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse.h b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse.h
new file mode 120000
index 000000000..773f3f322
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse.h
@@ -0,0 +1 @@
+../../../../../../OHHTTPStubs/Sources/OHHTTPStubsResponse.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHPathHelpers.h b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHPathHelpers.h
new file mode 120000
index 000000000..6a6273c69
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHPathHelpers.h
@@ -0,0 +1 @@
+../../../../../../OHHTTPStubs/Sources/OHPathHelpers.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubs.h b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubs.h
new file mode 120000
index 000000000..e466a3093
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubs.h
@@ -0,0 +1 @@
+../../../../../../OHHTTPStubs/Sources/OHHTTPStubs.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h
new file mode 120000
index 000000000..55a0a6a46
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h
@@ -0,0 +1 @@
+../../../../../../OHHTTPStubs/Sources/OHHTTPStubsResponse+HTTPMessage.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+JSON.h b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+JSON.h
new file mode 120000
index 000000000..247257b1d
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+JSON.h
@@ -0,0 +1 @@
+../../../../../../OHHTTPStubs/Sources/OHHTTPStubsResponse+JSON.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse.h b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse.h
new file mode 120000
index 000000000..773f3f322
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse.h
@@ -0,0 +1 @@
+../../../../../../OHHTTPStubs/Sources/OHHTTPStubsResponse.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHPathHelpers.h b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHPathHelpers.h
new file mode 120000
index 000000000..6a6273c69
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHPathHelpers.h
@@ -0,0 +1 @@
+../../../../../../OHHTTPStubs/Sources/OHPathHelpers.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Local Podspecs/OHHTTPStubs.podspec.json b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Local Podspecs/OHHTTPStubs.podspec.json
new file mode 100644
index 000000000..3be5f2250
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Local Podspecs/OHHTTPStubs.podspec.json	
@@ -0,0 +1,26 @@
+{
+  "name": "OHHTTPStubs",
+  "version": "4.0.1",
+  "summary": "Framework to stub your network requests like HTTP and help you write network unit tests with XCTest.",
+  "description": "A class to stub network requests easily:\n\n * Test your apps with fake network data (stubbed from file)\n * You can also customize your response headers and status code\n * Use customized stubs depending on the requests\n * Use custom response time to simulate slow network.\n * This works with any request (HTTP, HTTPS, or any protocol) sent using\n   the iOS URL Loading System (NSURLConnection, NSURLSession, AFNetworking, …)\n * This is really useful in unit testing, when you need to test network features\n   but don't want to hit the real network and fake some response data instead.\n * Has useful convenience methods to stub JSON content or fixture from a file\n * Compatible with Swift\n",
+  "homepage": "https://github.com/AliSoftware/OHHTTPStubs",
+  "license": "MIT",
+  "authors": {
+    "Olivier Halligon": "olivier.halligon+ae@gmail.com"
+  },
+  "source": {
+    "git": "https://github.com/AliSoftware/OHHTTPStubs.git",
+    "tag": "4.0.1"
+  },
+  "source_files": "OHHTTPStubs/Sources/*.{h,m}",
+  "public_header_files": "OHHTTPStubs/Sources/*.h",
+  "frameworks": [
+    "Foundation",
+    "CFNetwork"
+  ],
+  "requires_arc": true,
+  "platforms": {
+    "ios": "5.0",
+    "osx": "10.7"
+  }
+}
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Manifest.lock b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Manifest.lock
new file mode 100644
index 000000000..8192540ce
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Manifest.lock
@@ -0,0 +1,14 @@
+PODS:
+  - OHHTTPStubs (4.0.1)
+
+DEPENDENCIES:
+  - OHHTTPStubs (from `../..`)
+
+EXTERNAL SOURCES:
+  OHHTTPStubs:
+    :path: "../.."
+
+SPEC CHECKSUMS:
+  OHHTTPStubs: 69b1d48b7dfe838a355fdf48d8592d1042e3d85f
+
+COCOAPODS: 0.37.0
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Pods.xcodeproj/project.pbxproj b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Pods.xcodeproj/project.pbxproj
new file mode 100644
index 000000000..5c218cc64
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Pods.xcodeproj/project.pbxproj
@@ -0,0 +1,562 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		025EDA37E7DE8225A36E9533 /* OHHTTPStubs.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A6726A194863F5663B3675B /* OHHTTPStubs.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		04A739CC8DD477CF2DD1049A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FCC1018CD76A5124E04BCF56 /* Foundation.framework */; };
+		075B64EB9838CF1EC0D30922 /* OHHTTPStubsResponse+JSON.m in Sources */ = {isa = PBXBuildFile; fileRef = B78D37976D52B166349E5E6F /* OHHTTPStubsResponse+JSON.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		14483D9A6C49CA7A40EFE534 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FCC1018CD76A5124E04BCF56 /* Foundation.framework */; };
+		166C7DCBA88C67DD08E2213F /* Pods-OHHTTPStubs-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 0D519BA859D6F5C634D553D4 /* Pods-OHHTTPStubs-dummy.m */; };
+		2838C1C53AE2A4B7A0CB6B2D /* OHPathHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 78DEBA4FE0386495BD23333C /* OHPathHelpers.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		2A5F193F83B7231858F7168E /* OHHTTPStubsResponse+HTTPMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C4EA7ED7B1527D723F8E532 /* OHHTTPStubsResponse+HTTPMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		476FA37EB9E1E2550A09B791 /* Pods-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = EF5E38002A9F6264D56C1B71 /* Pods-dummy.m */; };
+		88E7C5F2FEE4A3B2BB0F62AC /* OHHTTPStubsResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 86F20EE5AC3F660475C1B1C0 /* OHHTTPStubsResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		B9C7CAB43CDB46B8F62A9BEE /* OHHTTPStubs.h in Headers */ = {isa = PBXBuildFile; fileRef = E0D231B2CD70092197143783 /* OHHTTPStubs.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		BF155DE6DF34A3513FD4E824 /* OHHTTPStubsResponse+HTTPMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 1BCF165693C58B3CF965CBD9 /* OHHTTPStubsResponse+HTTPMessage.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		D6E4E9277A6BE0092AB01AB6 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7AEB564388B3581B65467A32 /* CFNetwork.framework */; };
+		DD462307456DA68D48B3DD09 /* Pods-OHHTTPStubs-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = F9BE2226EACE897333DC5A85 /* Pods-OHHTTPStubs-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		EBF36E9C2568E24826C031B5 /* OHPathHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A996F9D34EDC707D02187F0 /* OHPathHelpers.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F0720B4AF2F6D426ED586B80 /* Pods-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 41DF781F1D5A3BD5192A49E9 /* Pods-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		FA49795CDB854B8AF5215EA9 /* OHHTTPStubsResponse+JSON.h in Headers */ = {isa = PBXBuildFile; fileRef = 5F033017DBD2D340A327913A /* OHHTTPStubsResponse+JSON.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		FD0D1769D5FA62B3B81F4A7B /* OHHTTPStubs+NSURLSessionConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 657749B5FFBC67FB429EF8C8 /* OHHTTPStubs+NSURLSessionConfiguration.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		FECF1D77B5EA6D3A14324E0E /* OHHTTPStubsResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 90935C1FB6D11C0CF2A1C0D0 /* OHHTTPStubsResponse.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		C797270235A90C615B678C99 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = C2CBDA3936450283A6DE5391 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = D30DD3818F4A6F62029AA2A7;
+			remoteInfo = "Pods-OHHTTPStubs";
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXFileReference section */
+		0A6726A194863F5663B3675B /* OHHTTPStubs.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OHHTTPStubs.m; sourceTree = "<group>"; };
+		0C4EA7ED7B1527D723F8E532 /* OHHTTPStubsResponse+HTTPMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OHHTTPStubsResponse+HTTPMessage.h"; sourceTree = "<group>"; };
+		0D519BA859D6F5C634D553D4 /* Pods-OHHTTPStubs-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-OHHTTPStubs-dummy.m"; sourceTree = "<group>"; };
+		0E1F5577F3CB2A1A816F4766 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Pods.release.xcconfig; sourceTree = "<group>"; };
+		18547927D8BAD627CE1F2767 /* Pods-environment.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-environment.h"; sourceTree = "<group>"; };
+		1BCF165693C58B3CF965CBD9 /* OHHTTPStubsResponse+HTTPMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "OHHTTPStubsResponse+HTTPMessage.m"; sourceTree = "<group>"; };
+		3133227F412A22268B8AF43A /* Pods.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = Pods.modulemap; sourceTree = "<group>"; };
+		3C4E18BA425FF99FB4BC94B2 /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		41DF781F1D5A3BD5192A49E9 /* Pods-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-umbrella.h"; sourceTree = "<group>"; };
+		50D1B3B17AC91BE94D7AC1C3 /* Pods-OHHTTPStubs.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-OHHTTPStubs.modulemap"; sourceTree = "<group>"; };
+		5A996F9D34EDC707D02187F0 /* OHPathHelpers.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OHPathHelpers.h; sourceTree = "<group>"; };
+		5C62297C51CB5C28BA2B8A3D /* Pods-OHHTTPStubs-Private.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-OHHTTPStubs-Private.xcconfig"; sourceTree = "<group>"; };
+		5F033017DBD2D340A327913A /* OHHTTPStubsResponse+JSON.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OHHTTPStubsResponse+JSON.h"; sourceTree = "<group>"; };
+		657749B5FFBC67FB429EF8C8 /* OHHTTPStubs+NSURLSessionConfiguration.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "OHHTTPStubs+NSURLSessionConfiguration.m"; sourceTree = "<group>"; };
+		68E4D04F52C1DCB5E40CC71F /* Podfile */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
+		776DB99A4E43C19DCEDA35EE /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		78DEBA4FE0386495BD23333C /* OHPathHelpers.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OHPathHelpers.m; sourceTree = "<group>"; };
+		7AEB564388B3581B65467A32 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/CFNetwork.framework; sourceTree = DEVELOPER_DIR; };
+		7CC91F06E268AD95D8E87E07 /* Pods-OHHTTPStubs-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-OHHTTPStubs-prefix.pch"; sourceTree = "<group>"; };
+		86F20EE5AC3F660475C1B1C0 /* OHHTTPStubsResponse.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OHHTTPStubsResponse.h; sourceTree = "<group>"; };
+		90935C1FB6D11C0CF2A1C0D0 /* OHHTTPStubsResponse.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = OHHTTPStubsResponse.m; sourceTree = "<group>"; };
+		B421722C71E69397A2EF865C /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		B78D37976D52B166349E5E6F /* OHHTTPStubsResponse+JSON.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "OHHTTPStubsResponse+JSON.m"; sourceTree = "<group>"; };
+		BE72840BBC26E4AACDC7A559 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Pods.debug.xcconfig; sourceTree = "<group>"; };
+		C9E457A0D563C1AA75CE83B1 /* Pods-OHHTTPStubs.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-OHHTTPStubs.xcconfig"; sourceTree = "<group>"; };
+		CB7B8D454F792A091232FCE4 /* Pods-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-acknowledgements.plist"; sourceTree = "<group>"; };
+		DF8436795410709AD8A59E65 /* Pods-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-resources.sh"; sourceTree = "<group>"; };
+		E0D231B2CD70092197143783 /* OHHTTPStubs.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OHHTTPStubs.h; sourceTree = "<group>"; };
+		E2B7684424038D4C151FBB37 /* Pods-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-frameworks.sh"; sourceTree = "<group>"; };
+		E9DC5D74566513AD12B939E0 /* OHHTTPStubs.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OHHTTPStubs.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		EC618A869241D8D41FCA5D66 /* Pods-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-acknowledgements.markdown"; sourceTree = "<group>"; };
+		EF5E38002A9F6264D56C1B71 /* Pods-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-dummy.m"; sourceTree = "<group>"; };
+		F9BE2226EACE897333DC5A85 /* Pods-OHHTTPStubs-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-OHHTTPStubs-umbrella.h"; sourceTree = "<group>"; };
+		FCC1018CD76A5124E04BCF56 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		BB29665972FBB8C2BDF6B926 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				04A739CC8DD477CF2DD1049A /* Foundation.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C668BD504E49E41CBCEF977A /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				D6E4E9277A6BE0092AB01AB6 /* CFNetwork.framework in Frameworks */,
+				14483D9A6C49CA7A40EFE534 /* Foundation.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		06A88E21739F55C66513EA3C /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				1FD2921CB92E9A0D66A7B44F /* iOS */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		1FD2921CB92E9A0D66A7B44F /* iOS */ = {
+			isa = PBXGroup;
+			children = (
+				7AEB564388B3581B65467A32 /* CFNetwork.framework */,
+				FCC1018CD76A5124E04BCF56 /* Foundation.framework */,
+			);
+			name = iOS;
+			sourceTree = "<group>";
+		};
+		50BB6BBA29675CDD0CA50ED6 /* Targets Support Files */ = {
+			isa = PBXGroup;
+			children = (
+				CE249CD186D7B774C5BED5DA /* Pods */,
+			);
+			name = "Targets Support Files";
+			sourceTree = "<group>";
+		};
+		5F05422CA8CFAC32170B6ED8 /* Development Pods */ = {
+			isa = PBXGroup;
+			children = (
+				DE8EEB58B39A5A1D181D097D /* OHHTTPStubs */,
+			);
+			name = "Development Pods";
+			sourceTree = "<group>";
+		};
+		77B40E05B7BF4D0C1E0E9964 /* Support Files */ = {
+			isa = PBXGroup;
+			children = (
+				B421722C71E69397A2EF865C /* Info.plist */,
+				50D1B3B17AC91BE94D7AC1C3 /* Pods-OHHTTPStubs.modulemap */,
+				C9E457A0D563C1AA75CE83B1 /* Pods-OHHTTPStubs.xcconfig */,
+				5C62297C51CB5C28BA2B8A3D /* Pods-OHHTTPStubs-Private.xcconfig */,
+				0D519BA859D6F5C634D553D4 /* Pods-OHHTTPStubs-dummy.m */,
+				7CC91F06E268AD95D8E87E07 /* Pods-OHHTTPStubs-prefix.pch */,
+				F9BE2226EACE897333DC5A85 /* Pods-OHHTTPStubs-umbrella.h */,
+			);
+			name = "Support Files";
+			path = "Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs";
+			sourceTree = "<group>";
+		};
+		CE249CD186D7B774C5BED5DA /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				776DB99A4E43C19DCEDA35EE /* Info.plist */,
+				3133227F412A22268B8AF43A /* Pods.modulemap */,
+				EC618A869241D8D41FCA5D66 /* Pods-acknowledgements.markdown */,
+				CB7B8D454F792A091232FCE4 /* Pods-acknowledgements.plist */,
+				EF5E38002A9F6264D56C1B71 /* Pods-dummy.m */,
+				18547927D8BAD627CE1F2767 /* Pods-environment.h */,
+				E2B7684424038D4C151FBB37 /* Pods-frameworks.sh */,
+				DF8436795410709AD8A59E65 /* Pods-resources.sh */,
+				41DF781F1D5A3BD5192A49E9 /* Pods-umbrella.h */,
+				BE72840BBC26E4AACDC7A559 /* Pods.debug.xcconfig */,
+				0E1F5577F3CB2A1A816F4766 /* Pods.release.xcconfig */,
+			);
+			name = Pods;
+			path = "Target Support Files/Pods";
+			sourceTree = "<group>";
+		};
+		D2A210717D0CD3840C8071EA /* Sources */ = {
+			isa = PBXGroup;
+			children = (
+				E0D231B2CD70092197143783 /* OHHTTPStubs.h */,
+				0A6726A194863F5663B3675B /* OHHTTPStubs.m */,
+				657749B5FFBC67FB429EF8C8 /* OHHTTPStubs+NSURLSessionConfiguration.m */,
+				86F20EE5AC3F660475C1B1C0 /* OHHTTPStubsResponse.h */,
+				90935C1FB6D11C0CF2A1C0D0 /* OHHTTPStubsResponse.m */,
+				0C4EA7ED7B1527D723F8E532 /* OHHTTPStubsResponse+HTTPMessage.h */,
+				1BCF165693C58B3CF965CBD9 /* OHHTTPStubsResponse+HTTPMessage.m */,
+				5F033017DBD2D340A327913A /* OHHTTPStubsResponse+JSON.h */,
+				B78D37976D52B166349E5E6F /* OHHTTPStubsResponse+JSON.m */,
+				5A996F9D34EDC707D02187F0 /* OHPathHelpers.h */,
+				78DEBA4FE0386495BD23333C /* OHPathHelpers.m */,
+			);
+			path = Sources;
+			sourceTree = "<group>";
+		};
+		DB5D8EF15D472590591893B1 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				E9DC5D74566513AD12B939E0 /* OHHTTPStubs.framework */,
+				3C4E18BA425FF99FB4BC94B2 /* Pods.framework */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		DE8EEB58B39A5A1D181D097D /* OHHTTPStubs */ = {
+			isa = PBXGroup;
+			children = (
+				E4D8AAB427BAAC84F3957D3F /* OHHTTPStubs */,
+				77B40E05B7BF4D0C1E0E9964 /* Support Files */,
+			);
+			name = OHHTTPStubs;
+			path = ../../..;
+			sourceTree = "<group>";
+		};
+		E4D8AAB427BAAC84F3957D3F /* OHHTTPStubs */ = {
+			isa = PBXGroup;
+			children = (
+				D2A210717D0CD3840C8071EA /* Sources */,
+			);
+			path = OHHTTPStubs;
+			sourceTree = "<group>";
+		};
+		F83DE1D494882E34A62D48B1 = {
+			isa = PBXGroup;
+			children = (
+				68E4D04F52C1DCB5E40CC71F /* Podfile */,
+				5F05422CA8CFAC32170B6ED8 /* Development Pods */,
+				06A88E21739F55C66513EA3C /* Frameworks */,
+				DB5D8EF15D472590591893B1 /* Products */,
+				50BB6BBA29675CDD0CA50ED6 /* Targets Support Files */,
+			);
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		6109CBCD7C1C4DD48A864FB1 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				B9C7CAB43CDB46B8F62A9BEE /* OHHTTPStubs.h in Headers */,
+				2A5F193F83B7231858F7168E /* OHHTTPStubsResponse+HTTPMessage.h in Headers */,
+				FA49795CDB854B8AF5215EA9 /* OHHTTPStubsResponse+JSON.h in Headers */,
+				88E7C5F2FEE4A3B2BB0F62AC /* OHHTTPStubsResponse.h in Headers */,
+				EBF36E9C2568E24826C031B5 /* OHPathHelpers.h in Headers */,
+				DD462307456DA68D48B3DD09 /* Pods-OHHTTPStubs-umbrella.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		6B304C1E935C3B6D384BFC1A /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				F0720B4AF2F6D426ED586B80 /* Pods-umbrella.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		520A8502FB55654F3D44663F /* Pods */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 35920CD46DC6721D6B943E13 /* Build configuration list for PBXNativeTarget "Pods" */;
+			buildPhases = (
+				87574F723CF88872A3710C10 /* Sources */,
+				BB29665972FBB8C2BDF6B926 /* Frameworks */,
+				6B304C1E935C3B6D384BFC1A /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				3E902AAFC88492FC4CC25BCC /* PBXTargetDependency */,
+			);
+			name = Pods;
+			productName = Pods;
+			productReference = 3C4E18BA425FF99FB4BC94B2 /* Pods.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+		D30DD3818F4A6F62029AA2A7 /* Pods-OHHTTPStubs */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 9E320C31BC20443632AE890E /* Build configuration list for PBXNativeTarget "Pods-OHHTTPStubs" */;
+			buildPhases = (
+				70302128C9E296DA5A01A392 /* Sources */,
+				C668BD504E49E41CBCEF977A /* Frameworks */,
+				6109CBCD7C1C4DD48A864FB1 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "Pods-OHHTTPStubs";
+			productName = "Pods-OHHTTPStubs";
+			productReference = E9DC5D74566513AD12B939E0 /* OHHTTPStubs.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		C2CBDA3936450283A6DE5391 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0640;
+			};
+			buildConfigurationList = 5DAD56263AD60CAD28B28D71 /* Build configuration list for PBXProject "Pods" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = F83DE1D494882E34A62D48B1;
+			productRefGroup = DB5D8EF15D472590591893B1 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				520A8502FB55654F3D44663F /* Pods */,
+				D30DD3818F4A6F62029AA2A7 /* Pods-OHHTTPStubs */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		70302128C9E296DA5A01A392 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				FD0D1769D5FA62B3B81F4A7B /* OHHTTPStubs+NSURLSessionConfiguration.m in Sources */,
+				025EDA37E7DE8225A36E9533 /* OHHTTPStubs.m in Sources */,
+				BF155DE6DF34A3513FD4E824 /* OHHTTPStubsResponse+HTTPMessage.m in Sources */,
+				075B64EB9838CF1EC0D30922 /* OHHTTPStubsResponse+JSON.m in Sources */,
+				FECF1D77B5EA6D3A14324E0E /* OHHTTPStubsResponse.m in Sources */,
+				2838C1C53AE2A4B7A0CB6B2D /* OHPathHelpers.m in Sources */,
+				166C7DCBA88C67DD08E2213F /* Pods-OHHTTPStubs-dummy.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		87574F723CF88872A3710C10 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				476FA37EB9E1E2550A09B791 /* Pods-dummy.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		3E902AAFC88492FC4CC25BCC /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = "Pods-OHHTTPStubs";
+			target = D30DD3818F4A6F62029AA2A7 /* Pods-OHHTTPStubs */;
+			targetProxy = C797270235A90C615B678C99 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin XCBuildConfiguration section */
+		204E7D31CAF5A4F252A4D622 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 5C62297C51CB5C28BA2B8A3D /* Pods-OHHTTPStubs-Private.xcconfig */;
+			buildSettings = {
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_PREFIX_HEADER = "Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/Pods-OHHTTPStubs/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs.modulemap";
+				MTL_ENABLE_DEBUG_INFO = YES;
+				PRODUCT_NAME = OHHTTPStubs;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		2AE519C01027BBCA761BBBAC /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 5C62297C51CB5C28BA2B8A3D /* Pods-OHHTTPStubs-Private.xcconfig */;
+			buildSettings = {
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_PREFIX_HEADER = "Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/Pods-OHHTTPStubs/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs.modulemap";
+				MTL_ENABLE_DEBUG_INFO = NO;
+				PRODUCT_NAME = OHHTTPStubs;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		4C97FCFEC9543CEEE63EBFA1 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = BE72840BBC26E4AACDC7A559 /* Pods.debug.xcconfig */;
+			buildSettings = {
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				INFOPLIST_FILE = "Target Support Files/Pods/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/Pods/Pods.modulemap";
+				MTL_ENABLE_DEBUG_INFO = YES;
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_NAME = Pods;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		4E419842EB75B63AB6EB7CD9 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 0E1F5577F3CB2A1A816F4766 /* Pods.release.xcconfig */;
+			buildSettings = {
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				INFOPLIST_FILE = "Target Support Files/Pods/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/Pods/Pods.modulemap";
+				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_NAME = Pods;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		8B7B96657207941542B8A42E /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = YES;
+				ENABLE_NS_ASSERTIONS = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_PREPROCESSOR_DEFINITIONS = "RELEASE=1";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				STRIP_INSTALLED_PRODUCT = NO;
+				SYMROOT = "${SRCROOT}/../build";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		F3155A251F8FB27D033C80B7 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				ONLY_ACTIVE_ARCH = YES;
+				STRIP_INSTALLED_PRODUCT = NO;
+				SYMROOT = "${SRCROOT}/../build";
+			};
+			name = Debug;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		35920CD46DC6721D6B943E13 /* Build configuration list for PBXNativeTarget "Pods" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4C97FCFEC9543CEEE63EBFA1 /* Debug */,
+				4E419842EB75B63AB6EB7CD9 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		5DAD56263AD60CAD28B28D71 /* Build configuration list for PBXProject "Pods" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				F3155A251F8FB27D033C80B7 /* Debug */,
+				8B7B96657207941542B8A42E /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		9E320C31BC20443632AE890E /* Build configuration list for PBXNativeTarget "Pods-OHHTTPStubs" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				204E7D31CAF5A4F252A4D622 /* Debug */,
+				2AE519C01027BBCA761BBBAC /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = C2CBDA3936450283A6DE5391 /* Project object */;
+}
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Info.plist b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Info.plist
new file mode 100644
index 000000000..c10e7eab4
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Info.plist	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleExecutable</key>
+  <string>${EXECUTABLE_NAME}</string>
+  <key>CFBundleIdentifier</key>
+  <string>org.cocoapods.${PRODUCT_NAME:rfc1034identifier}</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>${PRODUCT_NAME}</string>
+  <key>CFBundlePackageType</key>
+  <string>FMWK</string>
+  <key>CFBundleShortVersionString</key>
+  <string>4.0.1</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>${CURRENT_PROJECT_VERSION}</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
+</dict>
+</plist>
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-Private.xcconfig b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-Private.xcconfig
new file mode 100644
index 000000000..56b72965a
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-Private.xcconfig	
@@ -0,0 +1,9 @@
+#include "Pods-OHHTTPStubs.xcconfig"
+CONFIGURATION_BUILD_DIR = $PODS_FRAMEWORK_BUILD_PATH
+FRAMEWORK_SEARCH_PATHS = "$PODS_FRAMEWORK_BUILD_PATH"
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/OHHTTPStubs" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/OHHTTPStubs"
+OTHER_LDFLAGS = ${PODS_OHHTTPSTUBS_OTHER_LDFLAGS} -ObjC
+PODS_FRAMEWORK_BUILD_PATH = $(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/Pods
+PODS_ROOT = ${SRCROOT}
+SKIP_INSTALL = YES
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-dummy.m b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-dummy.m
new file mode 100644
index 000000000..6e93a65cc
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-dummy.m	
@@ -0,0 +1,5 @@
+#import <Foundation/Foundation.h>
+@interface PodsDummy_Pods_OHHTTPStubs : NSObject
+@end
+@implementation PodsDummy_Pods_OHHTTPStubs
+@end
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-prefix.pch b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-prefix.pch
new file mode 100644
index 000000000..95cf11d9f
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-prefix.pch	
@@ -0,0 +1,5 @@
+#ifdef __OBJC__
+#import <UIKit/UIKit.h>
+#endif
+
+#import "Pods-environment.h"
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-umbrella.h b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-umbrella.h
new file mode 100644
index 000000000..28cfb1c4c
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-umbrella.h	
@@ -0,0 +1,11 @@
+#import <UIKit/UIKit.h>
+
+#import "OHHTTPStubs.h"
+#import "OHHTTPStubsResponse+HTTPMessage.h"
+#import "OHHTTPStubsResponse+JSON.h"
+#import "OHHTTPStubsResponse.h"
+#import "OHPathHelpers.h"
+
+FOUNDATION_EXPORT double OHHTTPStubsVersionNumber;
+FOUNDATION_EXPORT const unsigned char OHHTTPStubsVersionString[];
+
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs.modulemap b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs.modulemap
new file mode 100644
index 000000000..efe706e39
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs.modulemap	
@@ -0,0 +1,6 @@
+framework module OHHTTPStubs {
+  umbrella header "Pods-OHHTTPStubs-umbrella.h"
+
+  export *
+  module * { export * }
+}
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs.xcconfig b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs.xcconfig
new file mode 100644
index 000000000..de1d241ad
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs.xcconfig	
@@ -0,0 +1 @@
+PODS_OHHTTPSTUBS_OTHER_LDFLAGS = -framework "CFNetwork" -framework "Foundation"
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Info.plist b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Info.plist
new file mode 100644
index 000000000..697454258
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Info.plist	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleExecutable</key>
+  <string>${EXECUTABLE_NAME}</string>
+  <key>CFBundleIdentifier</key>
+  <string>org.cocoapods.${PRODUCT_NAME:rfc1034identifier}</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>${PRODUCT_NAME}</string>
+  <key>CFBundlePackageType</key>
+  <string>FMWK</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0.0</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>${CURRENT_PROJECT_VERSION}</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
+</dict>
+</plist>
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown
new file mode 100644
index 000000000..79d3603ad
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown	
@@ -0,0 +1,15 @@
+# Acknowledgements
+This application makes use of the following third party libraries:
+
+## OHHTTPStubs
+
+- MIT LICENSE -
+
+Copyright (c) 2012 Olivier Halligon
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Generated by CocoaPods - http://cocoapods.org
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-acknowledgements.plist b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-acknowledgements.plist
new file mode 100644
index 000000000..756aa4392
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-acknowledgements.plist	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreferenceSpecifiers</key>
+	<array>
+		<dict>
+			<key>FooterText</key>
+			<string>This application makes use of the following third party libraries:</string>
+			<key>Title</key>
+			<string>Acknowledgements</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>- MIT LICENSE -
+
+Copyright (c) 2012 Olivier Halligon
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</string>
+			<key>Title</key>
+			<string>OHHTTPStubs</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>Generated by CocoaPods - http://cocoapods.org</string>
+			<key>Title</key>
+			<string></string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+	</array>
+	<key>StringsTable</key>
+	<string>Acknowledgements</string>
+	<key>Title</key>
+	<string>Acknowledgements</string>
+</dict>
+</plist>
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-dummy.m b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-dummy.m
new file mode 100644
index 000000000..ade64bd1a
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-dummy.m	
@@ -0,0 +1,5 @@
+#import <Foundation/Foundation.h>
+@interface PodsDummy_Pods : NSObject
+@end
+@implementation PodsDummy_Pods
+@end
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-environment.h b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-environment.h
new file mode 100644
index 000000000..5918510c4
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-environment.h	
@@ -0,0 +1,14 @@
+
+// To check if a library is compiled with CocoaPods you
+// can use the `COCOAPODS` macro definition which is
+// defined in the xcconfigs so it is available in
+// headers also when they are imported in the client
+// project.
+
+
+// OHHTTPStubs
+#define COCOAPODS_POD_AVAILABLE_OHHTTPStubs
+#define COCOAPODS_VERSION_MAJOR_OHHTTPStubs 4
+#define COCOAPODS_VERSION_MINOR_OHHTTPStubs 0
+#define COCOAPODS_VERSION_PATCH_OHHTTPStubs 1
+
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-frameworks.sh b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-frameworks.sh
new file mode 100755
index 000000000..5b176d261
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-frameworks.sh	
@@ -0,0 +1,55 @@
+#!/bin/sh
+set -e
+
+echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+
+SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
+
+install_framework()
+{
+  local source="${BUILT_PRODUCTS_DIR}/Pods/$1"
+  local destination="${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+
+  if [ -L "${source}" ]; then
+      echo "Symlinked..."
+      source=$(readlink "${source}")
+  fi
+
+  # use filter instead of exclude so missing patterns dont' throw errors
+  echo "rsync -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers/" --filter "- PrivateHeaders/" --filter "- Modules/" ${source} ${destination}"
+  rsync -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers/" --filter "- PrivateHeaders/" --filter "- Modules/" "${source}" "${destination}"
+  # Resign the code if required by the build settings to avoid unstable apps
+  if [ "${CODE_SIGNING_REQUIRED}" == "YES" ]; then
+      code_sign "${destination}/$1"
+  fi
+
+  # Embed linked Swift runtime libraries
+  local basename
+  basename=$(echo $1 | sed -E s/\\..+// && exit ${PIPESTATUS[0]})
+  local swift_runtime_libs
+  swift_runtime_libs=$(xcrun otool -LX "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/$1/${basename}" | grep --color=never @rpath/libswift | sed -E s/@rpath\\/\(.+dylib\).*/\\1/g | uniq -u  && exit ${PIPESTATUS[0]})
+  for lib in $swift_runtime_libs; do
+    echo "rsync -auv \"${SWIFT_STDLIB_PATH}/${lib}\" \"${destination}\""
+    rsync -auv "${SWIFT_STDLIB_PATH}/${lib}" "${destination}"
+    if [ "${CODE_SIGNING_REQUIRED}" == "YES" ]; then
+      code_sign "${destination}/${lib}"
+    fi
+  done
+}
+
+# Signs a framework with the provided identity
+code_sign() {
+  # Use the current code_sign_identitiy
+  echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
+  echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements $1"
+  /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements "$1"
+}
+
+
+if [[ "$CONFIGURATION" == "Debug" ]]; then
+  install_framework 'OHHTTPStubs.framework'
+fi
+if [[ "$CONFIGURATION" == "Release" ]]; then
+  install_framework 'OHHTTPStubs.framework'
+fi
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-resources.sh b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-resources.sh
new file mode 100755
index 000000000..43f08523e
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-resources.sh	
@@ -0,0 +1,93 @@
+#!/bin/sh
+set -e
+
+mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+
+RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
+> "$RESOURCES_TO_COPY"
+
+XCASSET_FILES=()
+
+realpath() {
+  DIRECTORY=$(cd "${1%/*}" && pwd)
+  FILENAME="${1##*/}"
+  echo "$DIRECTORY/$FILENAME"
+}
+
+install_resource()
+{
+  case $1 in
+    *.storyboard)
+      echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc ${PODS_ROOT}/$1 --sdk ${SDKROOT}"
+      ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc" "${PODS_ROOT}/$1" --sdk "${SDKROOT}"
+      ;;
+    *.xib)
+        echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib ${PODS_ROOT}/$1 --sdk ${SDKROOT}"
+      ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib" "${PODS_ROOT}/$1" --sdk "${SDKROOT}"
+      ;;
+    *.framework)
+      echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      echo "rsync -av ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      rsync -av "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      ;;
+    *.xcdatamodel)
+      echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1"`.mom\""
+      xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodel`.mom"
+      ;;
+    *.xcdatamodeld)
+      echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd\""
+      xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd"
+      ;;
+    *.xcmappingmodel)
+      echo "xcrun mapc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm\""
+      xcrun mapc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm"
+      ;;
+    *.xcassets)
+      ABSOLUTE_XCASSET_FILE=$(realpath "${PODS_ROOT}/$1")
+      XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
+      ;;
+    /*)
+      echo "$1"
+      echo "$1" >> "$RESOURCES_TO_COPY"
+      ;;
+    *)
+      echo "${PODS_ROOT}/$1"
+      echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY"
+      ;;
+  esac
+}
+
+rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+if [[ "${ACTION}" == "install" ]]; then
+  rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+fi
+rm -f "$RESOURCES_TO_COPY"
+
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
+then
+  case "${TARGETED_DEVICE_FAMILY}" in
+    1,2)
+      TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
+      ;;
+    1)
+      TARGET_DEVICE_ARGS="--target-device iphone"
+      ;;
+    2)
+      TARGET_DEVICE_ARGS="--target-device ipad"
+      ;;
+    *)
+      TARGET_DEVICE_ARGS="--target-device mac"
+      ;;
+  esac
+
+  # Find all other xcassets (this unfortunately includes those of path pods and other targets).
+  OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
+  while read line; do
+    if [[ $line != "`realpath $PODS_ROOT`*" ]]; then
+      XCASSET_FILES+=("$line")
+    fi
+  done <<<"$OTHER_XCASSETS"
+
+  printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${IPHONEOS_DEPLOYMENT_TARGET}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+fi
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-umbrella.h b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-umbrella.h
new file mode 100644
index 000000000..21dcfd2c2
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-umbrella.h	
@@ -0,0 +1,6 @@
+#import <UIKit/UIKit.h>
+
+
+FOUNDATION_EXPORT double PodsVersionNumber;
+FOUNDATION_EXPORT const unsigned char PodsVersionString[];
+
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods.debug.xcconfig b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods.debug.xcconfig
new file mode 100644
index 000000000..c7ebebe60
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods.debug.xcconfig	
@@ -0,0 +1,8 @@
+FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_FRAMEWORK_BUILD_PATH"
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
+OTHER_CFLAGS = $(inherited) -iquote "$PODS_FRAMEWORK_BUILD_PATH/OHHTTPStubs.framework/Headers"
+OTHER_LDFLAGS = $(inherited) -ObjC -framework "OHHTTPStubs"
+OTHER_LIBTOOLFLAGS = $(OTHER_LDFLAGS)
+PODS_FRAMEWORK_BUILD_PATH = $(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/Pods
+PODS_ROOT = ${SRCROOT}/Pods
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods.modulemap b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods.modulemap
new file mode 100644
index 000000000..841341307
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods.modulemap	
@@ -0,0 +1,6 @@
+framework module Pods {
+  umbrella header "Pods-umbrella.h"
+
+  export *
+  module * { export * }
+}
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods.release.xcconfig b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods.release.xcconfig
new file mode 100644
index 000000000..c7ebebe60
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods.release.xcconfig	
@@ -0,0 +1,8 @@
+FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_FRAMEWORK_BUILD_PATH"
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
+OTHER_CFLAGS = $(inherited) -iquote "$PODS_FRAMEWORK_BUILD_PATH/OHHTTPStubs.framework/Headers"
+OTHER_LDFLAGS = $(inherited) -ObjC -framework "OHHTTPStubs"
+OTHER_LIBTOOLFLAGS = $(OTHER_LDFLAGS)
+PODS_FRAMEWORK_BUILD_PATH = $(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/Pods
+PODS_ROOT = ${SRCROOT}/Pods
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Stubs/stub.jpg b/test/ios/OHHTTPStubs/Examples/Swift/Stubs/stub.jpg
new file mode 100644
index 000000000..c42a21cd7
Binary files /dev/null and b/test/ios/OHHTTPStubs/Examples/Swift/Stubs/stub.jpg differ
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Stubs/stub.txt b/test/ios/OHHTTPStubs/Examples/Swift/Stubs/stub.txt
new file mode 100644
index 000000000..e662f91b2
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Stubs/stub.txt
@@ -0,0 +1,3 @@
+This is the text from your stub.
+
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diem nonummy nibh euismod tincidunt ut lacreet dolore magna aliguam erat volutpat. Ut wisis enim ad minim veniam, quis nostrud exerci tution ullam corper suscipit lobortis nisi ut aliquip ex ea commodo consequat. Duis te feugi facilisi. Duis autem dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit au gue duis dolore te feugat nulla facilisi.
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Supporting Files/Default-568h@2x.png b/test/ios/OHHTTPStubs/Examples/Swift/Supporting Files/Default-568h@2x.png
new file mode 100644
index 000000000..0891b7aab
Binary files /dev/null and b/test/ios/OHHTTPStubs/Examples/Swift/Supporting Files/Default-568h@2x.png differ
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Supporting Files/Images.xcassets/AppIcon.appiconset/Contents.json b/test/ios/OHHTTPStubs/Examples/Swift/Supporting Files/Images.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 000000000..36d2c80d8
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Supporting Files/Images.xcassets/AppIcon.appiconset/Contents.json	
@@ -0,0 +1,68 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "76x76",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "76x76",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Supporting Files/Info.plist b/test/ios/OHHTTPStubs/Examples/Swift/Supporting Files/Info.plist
new file mode 100644
index 000000000..29b20c32a
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Supporting Files/Info.plist	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.alisoftware.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIMainStoryboardFile</key>
+	<string>Main</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Supporting Files/LaunchScreen.xib b/test/ios/OHHTTPStubs/Examples/Swift/Supporting Files/LaunchScreen.xib
new file mode 100644
index 000000000..a9be7a994
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Examples/Swift/Supporting Files/LaunchScreen.xib	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6214" systemVersion="14A314h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207"/>
+        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2015 AliSoftware. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+                    <rect key="frame" x="20" y="439" width="441" height="21"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="OHHTTPStubsDemo" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
+                    <rect key="frame" x="20" y="140" width="441" height="43"/>
+                    <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
+                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <nil key="highlightedColor"/>
+                </label>
+            </subviews>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+            <constraints>
+                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
+                <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
+                <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
+                <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
+                <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
+                <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
+            </constraints>
+            <nil key="simulatedStatusBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <point key="canvasLocation" x="548" y="455"/>
+        </view>
+    </objects>
+</document>
diff --git a/test/ios/OHHTTPStubs/LICENSE b/test/ios/OHHTTPStubs/LICENSE
new file mode 100644
index 000000000..a83928dd2
--- /dev/null
+++ b/test/ios/OHHTTPStubs/LICENSE
@@ -0,0 +1,9 @@
+- MIT LICENSE -
+
+Copyright (c) 2012 Olivier Halligon
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs.podspec b/test/ios/OHHTTPStubs/OHHTTPStubs.podspec
new file mode 100644
index 000000000..ffa5e93ab
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs.podspec
@@ -0,0 +1,37 @@
+Pod::Spec.new do |s|
+
+  s.name         = "OHHTTPStubs"
+  s.version      = "4.0.1"
+
+  s.summary      = "Framework to stub your network requests like HTTP and help you write network unit tests with XCTest."
+  s.description  = <<-DESC.gsub(/^ +\|/,'')
+                    |A class to stub network requests easily:
+                    |
+                    | * Test your apps with fake network data (stubbed from file)
+                    | * You can also customize your response headers and status code
+                    | * Use customized stubs depending on the requests
+                    | * Use custom response time to simulate slow network.
+                    | * This works with any request (HTTP, HTTPS, or any protocol) sent using
+                    |   the iOS URL Loading System (NSURLConnection, NSURLSession, AFNetworking, …)
+                    | * This is really useful in unit testing, when you need to test network features
+                    |   but don't want to hit the real network and fake some response data instead.
+                    | * Has useful convenience methods to stub JSON content or fixture from a file
+                    | * Compatible with Swift
+                 DESC
+
+  s.homepage     = "https://github.com/AliSoftware/OHHTTPStubs"
+  s.license      = "MIT"
+  s.authors      = { 'Olivier Halligon' => 'olivier.halligon+ae@gmail.com' }
+
+  s.source       = { :git => "https://github.com/AliSoftware/OHHTTPStubs.git", :tag => s.version.to_s }
+
+  s.source_files = "OHHTTPStubs/Sources/*.{h,m}"
+  s.public_header_files = "OHHTTPStubs/Sources/*.h"
+
+  s.frameworks = 'Foundation', 'CFNetwork'
+
+  s.requires_arc = true
+  s.ios.deployment_target = '5.0'
+  s.osx.deployment_target = '10.7'
+
+end
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj b/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj
new file mode 100644
index 000000000..39f1c8607
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj
@@ -0,0 +1,1021 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		09110A4519805F4800D175E4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09110A4419805F4800D175E4 /* Foundation.framework */; };
+		09110A5319805F4800D175E4 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09110A5219805F4800D175E4 /* XCTest.framework */; };
+		09110A5419805F4800D175E4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09110A4419805F4800D175E4 /* Foundation.framework */; };
+		09110A5919805F4800D175E4 /* libOHHTTPStubs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 09110A4119805F4800D175E4 /* libOHHTTPStubs.a */; };
+		09110A6C1980605A00D175E4 /* OHHTTPStubs.m in Sources */ = {isa = PBXBuildFile; fileRef = 09110A6B1980605A00D175E4 /* OHHTTPStubs.m */; };
+		09110A741980606A00D175E4 /* OHHTTPStubsResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 09110A6F1980606A00D175E4 /* OHHTTPStubsResponse.m */; };
+		09110A751980606A00D175E4 /* OHHTTPStubsResponse+HTTPMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 09110A711980606A00D175E4 /* OHHTTPStubsResponse+HTTPMessage.m */; };
+		09110A761980606A00D175E4 /* OHHTTPStubsResponse+JSON.m in Sources */ = {isa = PBXBuildFile; fileRef = 09110A731980606A00D175E4 /* OHHTTPStubsResponse+JSON.m */; };
+		09110A791980608600D175E4 /* OHHTTPStubs+NSURLSessionConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 09110A781980608600D175E4 /* OHHTTPStubs+NSURLSessionConfiguration.m */; };
+		095981881980682800807DBE /* AFNetworkingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 095981481980668E00807DBE /* AFNetworkingTests.m */; };
+		095981891980682E00807DBE /* NilValuesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 095981491980668E00807DBE /* NilValuesTests.m */; };
+		0959818A1980682E00807DBE /* NSURLConnectionDelegateTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0959814A1980668E00807DBE /* NSURLConnectionDelegateTests.m */; };
+		0959818B1980682E00807DBE /* NSURLConnectionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0959814B1980668E00807DBE /* NSURLConnectionTests.m */; };
+		0959818C1980682E00807DBE /* NSURLSessionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0959814C1980668E00807DBE /* NSURLSessionTests.m */; };
+		0959818D1980682E00807DBE /* TimingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0959814D1980668E00807DBE /* TimingTests.m */; };
+		0959818E1980682E00807DBE /* WithContentsOfURLTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0959814E1980668E00807DBE /* WithContentsOfURLTests.m */; };
+		095981D319806A7900807DBE /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09110A5219805F4800D175E4 /* XCTest.framework */; };
+		095981D719806A7900807DBE /* OHHTTPStubs.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 095981C219806A7900807DBE /* OHHTTPStubs.framework */; };
+		095981EF19806AA200807DBE /* NilValuesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 095981491980668E00807DBE /* NilValuesTests.m */; };
+		095981F019806AA200807DBE /* NSURLConnectionDelegateTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0959814A1980668E00807DBE /* NSURLConnectionDelegateTests.m */; };
+		095981F119806AA200807DBE /* NSURLConnectionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0959814B1980668E00807DBE /* NSURLConnectionTests.m */; };
+		095981F219806AA200807DBE /* NSURLSessionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0959814C1980668E00807DBE /* NSURLSessionTests.m */; };
+		095981F319806AA200807DBE /* TimingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0959814D1980668E00807DBE /* TimingTests.m */; };
+		095981F419806AA200807DBE /* WithContentsOfURLTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0959814E1980668E00807DBE /* WithContentsOfURLTests.m */; };
+		095981F619806AAC00807DBE /* OHHTTPStubs.m in Sources */ = {isa = PBXBuildFile; fileRef = 09110A6B1980605A00D175E4 /* OHHTTPStubs.m */; };
+		095981F719806AAC00807DBE /* OHHTTPStubsResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 09110A6F1980606A00D175E4 /* OHHTTPStubsResponse.m */; };
+		095981F819806AAC00807DBE /* OHHTTPStubsResponse+HTTPMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 09110A711980606A00D175E4 /* OHHTTPStubsResponse+HTTPMessage.m */; };
+		095981F919806AAC00807DBE /* OHHTTPStubsResponse+JSON.m in Sources */ = {isa = PBXBuildFile; fileRef = 09110A731980606A00D175E4 /* OHHTTPStubsResponse+JSON.m */; };
+		095981FA19806AAC00807DBE /* OHHTTPStubs+NSURLSessionConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 09110A781980608600D175E4 /* OHHTTPStubs+NSURLSessionConfiguration.m */; };
+		095981FB19806AB700807DBE /* OHHTTPStubs.h in Headers */ = {isa = PBXBuildFile; fileRef = 09110A6A1980605A00D175E4 /* OHHTTPStubs.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		095981FC19806AF300807DBE /* OHHTTPStubs.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 09110A6A1980605A00D175E4 /* OHHTTPStubs.h */; };
+		095981FD19806AF300807DBE /* OHHTTPStubsResponse.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 09110A6E1980606A00D175E4 /* OHHTTPStubsResponse.h */; };
+		095981FE19806AF300807DBE /* OHHTTPStubsResponse+HTTPMessage.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 09110A701980606A00D175E4 /* OHHTTPStubsResponse+HTTPMessage.h */; };
+		095981FF19806AF300807DBE /* OHHTTPStubsResponse+JSON.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 09110A721980606A00D175E4 /* OHHTTPStubsResponse+JSON.h */; };
+		0959820019806B1700807DBE /* OHHTTPStubsResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 09110A6E1980606A00D175E4 /* OHHTTPStubsResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		0959820119806B1E00807DBE /* OHHTTPStubsResponse+HTTPMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 09110A701980606A00D175E4 /* OHHTTPStubsResponse+HTTPMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		0959820219806B2200807DBE /* OHHTTPStubsResponse+JSON.h in Headers */ = {isa = PBXBuildFile; fileRef = 09110A721980606A00D175E4 /* OHHTTPStubsResponse+JSON.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		095B1AD51AE30BA7009D1B56 /* OHPathHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 095B1AD41AE30BA7009D1B56 /* OHPathHelpers.m */; };
+		095B1AD61AE3138C009D1B56 /* OHPathHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 095B1AD31AE30BA7009D1B56 /* OHPathHelpers.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		095B1AD71AE3138C009D1B56 /* OHPathHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 095B1AD31AE30BA7009D1B56 /* OHPathHelpers.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		095B1AD81AE31395009D1B56 /* OHPathHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 095B1AD41AE30BA7009D1B56 /* OHPathHelpers.m */; };
+		095B1AD91AE31396009D1B56 /* OHPathHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 095B1AD41AE30BA7009D1B56 /* OHPathHelpers.m */; };
+		095B1ADA1AE313E0009D1B56 /* OHPathHelpers.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 095B1AD31AE30BA7009D1B56 /* OHPathHelpers.h */; };
+		0DB397E35DDB6808A5496D53 /* libPods-OHHTTPStubs Mac Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F49690D948DE88BBB4A36B11 /* libPods-OHHTTPStubs Mac Tests.a */; };
+		47AF337B1A3775B600158C9F /* emptyfile.json in Resources */ = {isa = PBXBuildFile; fileRef = 47AF337A1A37757B00158C9F /* emptyfile.json */; };
+		47AF337C1A3775B600158C9F /* emptyfile.json in Resources */ = {isa = PBXBuildFile; fileRef = 47AF337A1A37757B00158C9F /* emptyfile.json */; };
+		4DD13AB8422F0151AF227209 /* libPods-OHHTTPStubs iOS Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 446DA13BA37A8466FF4F9D35 /* libPods-OHHTTPStubs iOS Tests.a */; };
+		725CD9B41A9EB6F600F84C8B /* OHHTTPStubs.m in Sources */ = {isa = PBXBuildFile; fileRef = 09110A6B1980605A00D175E4 /* OHHTTPStubs.m */; };
+		725CD9B51A9EB6F800F84C8B /* OHHTTPStubsResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 09110A6F1980606A00D175E4 /* OHHTTPStubsResponse.m */; };
+		725CD9B61A9EB6FA00F84C8B /* OHHTTPStubsResponse+HTTPMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 09110A711980606A00D175E4 /* OHHTTPStubsResponse+HTTPMessage.m */; };
+		725CD9B71A9EB6FD00F84C8B /* OHHTTPStubsResponse+JSON.m in Sources */ = {isa = PBXBuildFile; fileRef = 09110A731980606A00D175E4 /* OHHTTPStubsResponse+JSON.m */; };
+		725CD9B81A9EB70000F84C8B /* OHHTTPStubs+NSURLSessionConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 09110A781980608600D175E4 /* OHHTTPStubs+NSURLSessionConfiguration.m */; };
+		725CD9B91A9EB71000F84C8B /* OHHTTPStubs.h in Headers */ = {isa = PBXBuildFile; fileRef = 09110A6A1980605A00D175E4 /* OHHTTPStubs.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		725CD9BA1A9EB71500F84C8B /* OHHTTPStubsResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 09110A6E1980606A00D175E4 /* OHHTTPStubsResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		725CD9BB1A9EB71A00F84C8B /* OHHTTPStubsResponse+JSON.h in Headers */ = {isa = PBXBuildFile; fileRef = 09110A721980606A00D175E4 /* OHHTTPStubsResponse+JSON.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		725CD9BC1A9EB71D00F84C8B /* OHHTTPStubsResponse+HTTPMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 09110A701980606A00D175E4 /* OHHTTPStubsResponse+HTTPMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		09110A5719805F4800D175E4 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 09110A3919805F4800D175E4 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 09110A4019805F4800D175E4;
+			remoteInfo = "OHHTTPStubs iOS";
+		};
+		095981D519806A7900807DBE /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 09110A3919805F4800D175E4 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 095981C119806A7900807DBE;
+			remoteInfo = "OHHTTPStubs Mac";
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		09110A3F19805F4800D175E4 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "include/$(PRODUCT_NAME)";
+			dstSubfolderSpec = 16;
+			files = (
+				095B1ADA1AE313E0009D1B56 /* OHPathHelpers.h in CopyFiles */,
+				095981FC19806AF300807DBE /* OHHTTPStubs.h in CopyFiles */,
+				095981FD19806AF300807DBE /* OHHTTPStubsResponse.h in CopyFiles */,
+				095981FE19806AF300807DBE /* OHHTTPStubsResponse+HTTPMessage.h in CopyFiles */,
+				095981FF19806AF300807DBE /* OHHTTPStubsResponse+JSON.h in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		09110A4119805F4800D175E4 /* libOHHTTPStubs.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libOHHTTPStubs.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		09110A4419805F4800D175E4 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		09110A5119805F4800D175E4 /* OHHTTPStubs iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "OHHTTPStubs iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
+		09110A5219805F4800D175E4 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
+		09110A6A1980605A00D175E4 /* OHHTTPStubs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OHHTTPStubs.h; sourceTree = "<group>"; };
+		09110A6B1980605A00D175E4 /* OHHTTPStubs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OHHTTPStubs.m; sourceTree = "<group>"; };
+		09110A6E1980606A00D175E4 /* OHHTTPStubsResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OHHTTPStubsResponse.h; sourceTree = "<group>"; };
+		09110A6F1980606A00D175E4 /* OHHTTPStubsResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OHHTTPStubsResponse.m; sourceTree = "<group>"; };
+		09110A701980606A00D175E4 /* OHHTTPStubsResponse+HTTPMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OHHTTPStubsResponse+HTTPMessage.h"; sourceTree = "<group>"; };
+		09110A711980606A00D175E4 /* OHHTTPStubsResponse+HTTPMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "OHHTTPStubsResponse+HTTPMessage.m"; sourceTree = "<group>"; };
+		09110A721980606A00D175E4 /* OHHTTPStubsResponse+JSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OHHTTPStubsResponse+JSON.h"; sourceTree = "<group>"; };
+		09110A731980606A00D175E4 /* OHHTTPStubsResponse+JSON.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "OHHTTPStubsResponse+JSON.m"; sourceTree = "<group>"; };
+		09110A781980608600D175E4 /* OHHTTPStubs+NSURLSessionConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "OHHTTPStubs+NSURLSessionConfiguration.m"; sourceTree = "<group>"; };
+		095981451980657C00807DBE /* UnitTests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "UnitTests-Info.plist"; sourceTree = "<group>"; };
+		095981471980665400807DBE /* UnitTests-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UnitTests-Prefix.pch"; sourceTree = "<group>"; };
+		095981481980668E00807DBE /* AFNetworkingTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AFNetworkingTests.m; path = "Test Suites/AFNetworkingTests.m"; sourceTree = "<group>"; };
+		095981491980668E00807DBE /* NilValuesTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NilValuesTests.m; path = "Test Suites/NilValuesTests.m"; sourceTree = "<group>"; };
+		0959814A1980668E00807DBE /* NSURLConnectionDelegateTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSURLConnectionDelegateTests.m; path = "Test Suites/NSURLConnectionDelegateTests.m"; sourceTree = "<group>"; };
+		0959814B1980668E00807DBE /* NSURLConnectionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSURLConnectionTests.m; path = "Test Suites/NSURLConnectionTests.m"; sourceTree = "<group>"; };
+		0959814C1980668E00807DBE /* NSURLSessionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSURLSessionTests.m; path = "Test Suites/NSURLSessionTests.m"; sourceTree = "<group>"; };
+		0959814D1980668E00807DBE /* TimingTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TimingTests.m; path = "Test Suites/TimingTests.m"; sourceTree = "<group>"; };
+		0959814E1980668E00807DBE /* WithContentsOfURLTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WithContentsOfURLTests.m; path = "Test Suites/WithContentsOfURLTests.m"; sourceTree = "<group>"; };
+		0959819819806A4200807DBE /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		0959819919806A4200807DBE /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
+		0959819A19806A4200807DBE /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
+		095981C219806A7900807DBE /* OHHTTPStubs.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OHHTTPStubs.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		095981C619806A7900807DBE /* OHHTTPStubs Mac-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "OHHTTPStubs Mac-Info.plist"; sourceTree = "<group>"; };
+		095981D219806A7900807DBE /* OHHTTPStubs Mac Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "OHHTTPStubs Mac Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
+		095B1AD31AE30BA7009D1B56 /* OHPathHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OHPathHelpers.h; sourceTree = "<group>"; };
+		095B1AD41AE30BA7009D1B56 /* OHPathHelpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OHPathHelpers.m; sourceTree = "<group>"; };
+		0F72EA0B0A785AE724116B35 /* Pods-OHHTTPStubs iOS Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OHHTTPStubs iOS Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests.debug.xcconfig"; sourceTree = "<group>"; };
+		446DA13BA37A8466FF4F9D35 /* libPods-OHHTTPStubs iOS Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OHHTTPStubs iOS Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		47AF337A1A37757B00158C9F /* emptyfile.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = emptyfile.json; sourceTree = "<group>"; };
+		725CD99B1A9EB65100F84C8B /* OHHTTPStubs.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OHHTTPStubs.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		8DB8134EA435816E00804074 /* Pods-OHHTTPStubs iOS Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OHHTTPStubs iOS Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests.release.xcconfig"; sourceTree = "<group>"; };
+		B11995FF7A5A81D0A322D6FA /* Pods-OHHTTPStubs Mac Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OHHTTPStubs Mac Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests.debug.xcconfig"; sourceTree = "<group>"; };
+		E2483255B84CAC7897D6E98C /* Pods-OHHTTPStubs Mac Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OHHTTPStubs Mac Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests.release.xcconfig"; sourceTree = "<group>"; };
+		F49690D948DE88BBB4A36B11 /* libPods-OHHTTPStubs Mac Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OHHTTPStubs Mac Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		09110A3E19805F4800D175E4 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				09110A4519805F4800D175E4 /* Foundation.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		09110A4E19805F4800D175E4 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				09110A5319805F4800D175E4 /* XCTest.framework in Frameworks */,
+				09110A5919805F4800D175E4 /* libOHHTTPStubs.a in Frameworks */,
+				09110A5419805F4800D175E4 /* Foundation.framework in Frameworks */,
+				4DD13AB8422F0151AF227209 /* libPods-OHHTTPStubs iOS Tests.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		095981BE19806A7900807DBE /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		095981CF19806A7900807DBE /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				095981D719806A7900807DBE /* OHHTTPStubs.framework in Frameworks */,
+				095981D319806A7900807DBE /* XCTest.framework in Frameworks */,
+				0DB397E35DDB6808A5496D53 /* libPods-OHHTTPStubs Mac Tests.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		725CD9971A9EB65100F84C8B /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		09110A3819805F4800D175E4 = {
+			isa = PBXGroup;
+			children = (
+				09110A4619805F4800D175E4 /* OHHTTPStubs */,
+				095981C519806A7900807DBE /* Supporting Files */,
+				09110A5A19805F4800D175E4 /* UnitTests */,
+				09110A4319805F4800D175E4 /* Frameworks */,
+				09110A4219805F4800D175E4 /* Products */,
+				69EB7ED77E3A41F78D65093A /* Pods */,
+			);
+			sourceTree = "<group>";
+		};
+		09110A4219805F4800D175E4 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				09110A4119805F4800D175E4 /* libOHHTTPStubs.a */,
+				09110A5119805F4800D175E4 /* OHHTTPStubs iOS Tests.xctest */,
+				095981C219806A7900807DBE /* OHHTTPStubs.framework */,
+				095981D219806A7900807DBE /* OHHTTPStubs Mac Tests.xctest */,
+				725CD99B1A9EB65100F84C8B /* OHHTTPStubs.framework */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		09110A4319805F4800D175E4 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				09110A4419805F4800D175E4 /* Foundation.framework */,
+				09110A5219805F4800D175E4 /* XCTest.framework */,
+				0959819719806A4200807DBE /* Other Frameworks */,
+				F49690D948DE88BBB4A36B11 /* libPods-OHHTTPStubs Mac Tests.a */,
+				446DA13BA37A8466FF4F9D35 /* libPods-OHHTTPStubs iOS Tests.a */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		09110A4619805F4800D175E4 /* OHHTTPStubs */ = {
+			isa = PBXGroup;
+			children = (
+				09110A6A1980605A00D175E4 /* OHHTTPStubs.h */,
+				09110A6B1980605A00D175E4 /* OHHTTPStubs.m */,
+				09110A6D1980605D00D175E4 /* OHHTTPStubsResponse */,
+				09110A771980607200D175E4 /* NSURLSession Support */,
+				095B1AD31AE30BA7009D1B56 /* OHPathHelpers.h */,
+				095B1AD41AE30BA7009D1B56 /* OHPathHelpers.m */,
+			);
+			name = OHHTTPStubs;
+			path = Sources;
+			sourceTree = "<group>";
+		};
+		09110A5A19805F4800D175E4 /* UnitTests */ = {
+			isa = PBXGroup;
+			children = (
+				47AF33791A37755E00158C9F /* Fixtures */,
+				095981461980663000807DBE /* Test Suites */,
+				09110A5B19805F4800D175E4 /* Supporting Files */,
+			);
+			path = UnitTests;
+			sourceTree = "<group>";
+		};
+		09110A5B19805F4800D175E4 /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				095981471980665400807DBE /* UnitTests-Prefix.pch */,
+				095981451980657C00807DBE /* UnitTests-Info.plist */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
+		09110A6D1980605D00D175E4 /* OHHTTPStubsResponse */ = {
+			isa = PBXGroup;
+			children = (
+				09110A6E1980606A00D175E4 /* OHHTTPStubsResponse.h */,
+				09110A6F1980606A00D175E4 /* OHHTTPStubsResponse.m */,
+				09110A701980606A00D175E4 /* OHHTTPStubsResponse+HTTPMessage.h */,
+				09110A711980606A00D175E4 /* OHHTTPStubsResponse+HTTPMessage.m */,
+				09110A721980606A00D175E4 /* OHHTTPStubsResponse+JSON.h */,
+				09110A731980606A00D175E4 /* OHHTTPStubsResponse+JSON.m */,
+			);
+			name = OHHTTPStubsResponse;
+			sourceTree = "<group>";
+		};
+		09110A771980607200D175E4 /* NSURLSession Support */ = {
+			isa = PBXGroup;
+			children = (
+				09110A781980608600D175E4 /* OHHTTPStubs+NSURLSessionConfiguration.m */,
+			);
+			name = "NSURLSession Support";
+			sourceTree = "<group>";
+		};
+		095981461980663000807DBE /* Test Suites */ = {
+			isa = PBXGroup;
+			children = (
+				095981481980668E00807DBE /* AFNetworkingTests.m */,
+				095981491980668E00807DBE /* NilValuesTests.m */,
+				0959814A1980668E00807DBE /* NSURLConnectionDelegateTests.m */,
+				0959814B1980668E00807DBE /* NSURLConnectionTests.m */,
+				0959814C1980668E00807DBE /* NSURLSessionTests.m */,
+				0959814D1980668E00807DBE /* TimingTests.m */,
+				0959814E1980668E00807DBE /* WithContentsOfURLTests.m */,
+			);
+			name = "Test Suites";
+			sourceTree = "<group>";
+		};
+		0959819719806A4200807DBE /* Other Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				0959819819806A4200807DBE /* Foundation.framework */,
+				0959819919806A4200807DBE /* CoreData.framework */,
+				0959819A19806A4200807DBE /* AppKit.framework */,
+			);
+			name = "Other Frameworks";
+			sourceTree = "<group>";
+		};
+		095981C519806A7900807DBE /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				095981C619806A7900807DBE /* OHHTTPStubs Mac-Info.plist */,
+			);
+			path = "Supporting Files";
+			sourceTree = "<group>";
+		};
+		47AF33791A37755E00158C9F /* Fixtures */ = {
+			isa = PBXGroup;
+			children = (
+				47AF337A1A37757B00158C9F /* emptyfile.json */,
+			);
+			path = Fixtures;
+			sourceTree = "<group>";
+		};
+		69EB7ED77E3A41F78D65093A /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				B11995FF7A5A81D0A322D6FA /* Pods-OHHTTPStubs Mac Tests.debug.xcconfig */,
+				E2483255B84CAC7897D6E98C /* Pods-OHHTTPStubs Mac Tests.release.xcconfig */,
+				0F72EA0B0A785AE724116B35 /* Pods-OHHTTPStubs iOS Tests.debug.xcconfig */,
+				8DB8134EA435816E00804074 /* Pods-OHHTTPStubs iOS Tests.release.xcconfig */,
+			);
+			name = Pods;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		095981BF19806A7900807DBE /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				0959820219806B2200807DBE /* OHHTTPStubsResponse+JSON.h in Headers */,
+				0959820119806B1E00807DBE /* OHHTTPStubsResponse+HTTPMessage.h in Headers */,
+				0959820019806B1700807DBE /* OHHTTPStubsResponse.h in Headers */,
+				095B1AD71AE3138C009D1B56 /* OHPathHelpers.h in Headers */,
+				095981FB19806AB700807DBE /* OHHTTPStubs.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		725CD9981A9EB65100F84C8B /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				725CD9B91A9EB71000F84C8B /* OHHTTPStubs.h in Headers */,
+				725CD9BA1A9EB71500F84C8B /* OHHTTPStubsResponse.h in Headers */,
+				725CD9BB1A9EB71A00F84C8B /* OHHTTPStubsResponse+JSON.h in Headers */,
+				725CD9BC1A9EB71D00F84C8B /* OHHTTPStubsResponse+HTTPMessage.h in Headers */,
+				095B1AD61AE3138C009D1B56 /* OHPathHelpers.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		09110A4019805F4800D175E4 /* OHHTTPStubs iOS StaticLib */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 09110A6419805F4800D175E4 /* Build configuration list for PBXNativeTarget "OHHTTPStubs iOS StaticLib" */;
+			buildPhases = (
+				09110A3D19805F4800D175E4 /* Sources */,
+				09110A3E19805F4800D175E4 /* Frameworks */,
+				09110A3F19805F4800D175E4 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "OHHTTPStubs iOS StaticLib";
+			productName = OHHTTPStubs;
+			productReference = 09110A4119805F4800D175E4 /* libOHHTTPStubs.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+		09110A5019805F4800D175E4 /* OHHTTPStubs iOS Tests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 09110A6719805F4800D175E4 /* Build configuration list for PBXNativeTarget "OHHTTPStubs iOS Tests" */;
+			buildPhases = (
+				7F432602D77FABAF29E05AA8 /* Check Pods Manifest.lock */,
+				09110A4D19805F4800D175E4 /* Sources */,
+				09110A4E19805F4800D175E4 /* Frameworks */,
+				09110A4F19805F4800D175E4 /* Resources */,
+				2E71B8D8A7ECD8287E0E81D5 /* Copy Pods Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				09110A5819805F4800D175E4 /* PBXTargetDependency */,
+			);
+			name = "OHHTTPStubs iOS Tests";
+			productName = OHHTTPStubsTests;
+			productReference = 09110A5119805F4800D175E4 /* OHHTTPStubs iOS Tests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
+		095981C119806A7900807DBE /* OHHTTPStubs Mac Framework */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 095981E019806A7900807DBE /* Build configuration list for PBXNativeTarget "OHHTTPStubs Mac Framework" */;
+			buildPhases = (
+				095981BD19806A7900807DBE /* Sources */,
+				095981BE19806A7900807DBE /* Frameworks */,
+				095981BF19806A7900807DBE /* Headers */,
+				095981C019806A7900807DBE /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "OHHTTPStubs Mac Framework";
+			productName = "OHHTTPStubs Mac";
+			productReference = 095981C219806A7900807DBE /* OHHTTPStubs.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+		095981D119806A7900807DBE /* OHHTTPStubs Mac Tests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 095981E319806A7900807DBE /* Build configuration list for PBXNativeTarget "OHHTTPStubs Mac Tests" */;
+			buildPhases = (
+				752F2AD343353136781BDAB2 /* Check Pods Manifest.lock */,
+				095981CE19806A7900807DBE /* Sources */,
+				095981CF19806A7900807DBE /* Frameworks */,
+				095981D019806A7900807DBE /* Resources */,
+				BF1C89AB0FF2DD0E338DD44E /* Copy Pods Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				095981D619806A7900807DBE /* PBXTargetDependency */,
+			);
+			name = "OHHTTPStubs Mac Tests";
+			productName = "OHHTTPStubs Mac Tests";
+			productReference = 095981D219806A7900807DBE /* OHHTTPStubs Mac Tests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
+		725CD99A1A9EB65100F84C8B /* OHHTTPStubs iOS Framework */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 725CD9B21A9EB65200F84C8B /* Build configuration list for PBXNativeTarget "OHHTTPStubs iOS Framework" */;
+			buildPhases = (
+				725CD9961A9EB65100F84C8B /* Sources */,
+				725CD9971A9EB65100F84C8B /* Frameworks */,
+				725CD9981A9EB65100F84C8B /* Headers */,
+				725CD9991A9EB65100F84C8B /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "OHHTTPStubs iOS Framework";
+			productName = "OHHTTPStubs iOS Framework";
+			productReference = 725CD99B1A9EB65100F84C8B /* OHHTTPStubs.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		09110A3919805F4800D175E4 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0510;
+				ORGANIZATIONNAME = AliSoftware;
+				TargetAttributes = {
+					09110A5019805F4800D175E4 = {
+						TestTargetID = 09110A4019805F4800D175E4;
+					};
+					095981D119806A7900807DBE = {
+						TestTargetID = 095981C119806A7900807DBE;
+					};
+					725CD99A1A9EB65100F84C8B = {
+						CreatedOnToolsVersion = 6.1.1;
+					};
+				};
+			};
+			buildConfigurationList = 09110A3C19805F4800D175E4 /* Build configuration list for PBXProject "OHHTTPStubs" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 09110A3819805F4800D175E4;
+			productRefGroup = 09110A4219805F4800D175E4 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				09110A4019805F4800D175E4 /* OHHTTPStubs iOS StaticLib */,
+				09110A5019805F4800D175E4 /* OHHTTPStubs iOS Tests */,
+				725CD99A1A9EB65100F84C8B /* OHHTTPStubs iOS Framework */,
+				095981C119806A7900807DBE /* OHHTTPStubs Mac Framework */,
+				095981D119806A7900807DBE /* OHHTTPStubs Mac Tests */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		09110A4F19805F4800D175E4 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				47AF337B1A3775B600158C9F /* emptyfile.json in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		095981C019806A7900807DBE /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		095981D019806A7900807DBE /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				47AF337C1A3775B600158C9F /* emptyfile.json in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		725CD9991A9EB65100F84C8B /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		2E71B8D8A7ECD8287E0E81D5 /* Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Copy Pods Resources";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		752F2AD343353136781BDAB2 /* Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Check Pods Manifest.lock";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
+			showEnvVarsInLog = 0;
+		};
+		7F432602D77FABAF29E05AA8 /* Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Check Pods Manifest.lock";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
+			showEnvVarsInLog = 0;
+		};
+		BF1C89AB0FF2DD0E338DD44E /* Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Copy Pods Resources";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		09110A3D19805F4800D175E4 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				09110A751980606A00D175E4 /* OHHTTPStubsResponse+HTTPMessage.m in Sources */,
+				09110A761980606A00D175E4 /* OHHTTPStubsResponse+JSON.m in Sources */,
+				09110A791980608600D175E4 /* OHHTTPStubs+NSURLSessionConfiguration.m in Sources */,
+				09110A6C1980605A00D175E4 /* OHHTTPStubs.m in Sources */,
+				09110A741980606A00D175E4 /* OHHTTPStubsResponse.m in Sources */,
+				095B1AD51AE30BA7009D1B56 /* OHPathHelpers.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		09110A4D19805F4800D175E4 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				0959818D1980682E00807DBE /* TimingTests.m in Sources */,
+				0959818A1980682E00807DBE /* NSURLConnectionDelegateTests.m in Sources */,
+				0959818E1980682E00807DBE /* WithContentsOfURLTests.m in Sources */,
+				095981881980682800807DBE /* AFNetworkingTests.m in Sources */,
+				0959818C1980682E00807DBE /* NSURLSessionTests.m in Sources */,
+				0959818B1980682E00807DBE /* NSURLConnectionTests.m in Sources */,
+				095981891980682E00807DBE /* NilValuesTests.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		095981BD19806A7900807DBE /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				095981F719806AAC00807DBE /* OHHTTPStubsResponse.m in Sources */,
+				095981F819806AAC00807DBE /* OHHTTPStubsResponse+HTTPMessage.m in Sources */,
+				095981F619806AAC00807DBE /* OHHTTPStubs.m in Sources */,
+				095981F919806AAC00807DBE /* OHHTTPStubsResponse+JSON.m in Sources */,
+				095981FA19806AAC00807DBE /* OHHTTPStubs+NSURLSessionConfiguration.m in Sources */,
+				095B1AD91AE31396009D1B56 /* OHPathHelpers.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		095981CE19806A7900807DBE /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				095981F119806AA200807DBE /* NSURLConnectionTests.m in Sources */,
+				095981F319806AA200807DBE /* TimingTests.m in Sources */,
+				095981F419806AA200807DBE /* WithContentsOfURLTests.m in Sources */,
+				095981EF19806AA200807DBE /* NilValuesTests.m in Sources */,
+				095981F219806AA200807DBE /* NSURLSessionTests.m in Sources */,
+				095981F019806AA200807DBE /* NSURLConnectionDelegateTests.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		725CD9961A9EB65100F84C8B /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				725CD9B41A9EB6F600F84C8B /* OHHTTPStubs.m in Sources */,
+				725CD9B81A9EB70000F84C8B /* OHHTTPStubs+NSURLSessionConfiguration.m in Sources */,
+				725CD9B51A9EB6F800F84C8B /* OHHTTPStubsResponse.m in Sources */,
+				725CD9B71A9EB6FD00F84C8B /* OHHTTPStubsResponse+JSON.m in Sources */,
+				725CD9B61A9EB6FA00F84C8B /* OHHTTPStubsResponse+HTTPMessage.m in Sources */,
+				095B1AD81AE31395009D1B56 /* OHPathHelpers.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		09110A5819805F4800D175E4 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 09110A4019805F4800D175E4 /* OHHTTPStubs iOS StaticLib */;
+			targetProxy = 09110A5719805F4800D175E4 /* PBXContainerItemProxy */;
+		};
+		095981D619806A7900807DBE /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 095981C119806A7900807DBE /* OHHTTPStubs Mac Framework */;
+			targetProxy = 095981D519806A7900807DBE /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin XCBuildConfiguration section */
+		09110A6219805F4800D175E4 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"XCODE_VERSION=$(XCODE_VERSION_MAJOR)",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+			};
+			name = Debug;
+		};
+		09110A6319805F4800D175E4 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = YES;
+				ENABLE_NS_ASSERTIONS = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"XCODE_VERSION=$(XCODE_VERSION_MAJOR)",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				SDKROOT = iphoneos;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		09110A6519805F4800D175E4 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DSTROOT = /tmp/OHHTTPStubs.dst;
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = OHHTTPStubs;
+				SKIP_INSTALL = YES;
+			};
+			name = Debug;
+		};
+		09110A6619805F4800D175E4 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DSTROOT = /tmp/OHHTTPStubs.dst;
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = OHHTTPStubs;
+				SKIP_INSTALL = YES;
+			};
+			name = Release;
+		};
+		09110A6819805F4800D175E4 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 0F72EA0B0A785AE724116B35 /* Pods-OHHTTPStubs iOS Tests.debug.xcconfig */;
+			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(SDKROOT)/Developer/Library/Frameworks",
+					"$(inherited)",
+					"$(DEVELOPER_FRAMEWORKS_DIR)",
+				);
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "UnitTests/UnitTests-Prefix.pch";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				INFOPLIST_FILE = "UnitTests/UnitTests-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-ObjC",
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				WRAPPER_EXTENSION = xctest;
+			};
+			name = Debug;
+		};
+		09110A6919805F4800D175E4 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 8DB8134EA435816E00804074 /* Pods-OHHTTPStubs iOS Tests.release.xcconfig */;
+			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(SDKROOT)/Developer/Library/Frameworks",
+					"$(inherited)",
+					"$(DEVELOPER_FRAMEWORKS_DIR)",
+				);
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "UnitTests/UnitTests-Prefix.pch";
+				INFOPLIST_FILE = "UnitTests/UnitTests-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-ObjC",
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				WRAPPER_EXTENSION = xctest;
+			};
+			name = Release;
+		};
+		095981E119806A7900807DBE /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(DEVELOPER_FRAMEWORKS_DIR)",
+				);
+				FRAMEWORK_VERSION = A;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				INFOPLIST_FILE = "Supporting Files/OHHTTPStubs Mac-Info.plist";
+				INSTALL_PATH = "@rpath";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				PRODUCT_NAME = OHHTTPStubs;
+				SDKROOT = macosx;
+				WRAPPER_EXTENSION = framework;
+			};
+			name = Debug;
+		};
+		095981E219806A7900807DBE /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(DEVELOPER_FRAMEWORKS_DIR)",
+				);
+				FRAMEWORK_VERSION = A;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				INFOPLIST_FILE = "Supporting Files/OHHTTPStubs Mac-Info.plist";
+				INSTALL_PATH = "@rpath";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				PRODUCT_NAME = OHHTTPStubs;
+				SDKROOT = macosx;
+				WRAPPER_EXTENSION = framework;
+			};
+			name = Release;
+		};
+		095981E419806A7900807DBE /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = B11995FF7A5A81D0A322D6FA /* Pods-OHHTTPStubs Mac Tests.debug.xcconfig */;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(DEVELOPER_FRAMEWORKS_DIR)",
+					"$(inherited)",
+				);
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "UnitTests/UnitTests-Prefix.pch";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-ObjC",
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				WRAPPER_EXTENSION = xctest;
+			};
+			name = Debug;
+		};
+		095981E519806A7900807DBE /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = E2483255B84CAC7897D6E98C /* Pods-OHHTTPStubs Mac Tests.release.xcconfig */;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(DEVELOPER_FRAMEWORKS_DIR)",
+					"$(inherited)",
+				);
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "UnitTests/UnitTests-Prefix.pch";
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-ObjC",
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				WRAPPER_EXTENSION = xctest;
+			};
+			name = Release;
+		};
+		725CD9AE1A9EB65200F84C8B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				INFOPLIST_FILE = "Supporting Files/OHHTTPStubs iOS-Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MTL_ENABLE_DEBUG_INFO = YES;
+				PRODUCT_NAME = OHHTTPStubs;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		725CD9AF1A9EB65200F84C8B /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				INFOPLIST_FILE = "Supporting Files/OHHTTPStubs iOS-Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MTL_ENABLE_DEBUG_INFO = NO;
+				PRODUCT_NAME = OHHTTPStubs;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		09110A3C19805F4800D175E4 /* Build configuration list for PBXProject "OHHTTPStubs" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				09110A6219805F4800D175E4 /* Debug */,
+				09110A6319805F4800D175E4 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		09110A6419805F4800D175E4 /* Build configuration list for PBXNativeTarget "OHHTTPStubs iOS StaticLib" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				09110A6519805F4800D175E4 /* Debug */,
+				09110A6619805F4800D175E4 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		09110A6719805F4800D175E4 /* Build configuration list for PBXNativeTarget "OHHTTPStubs iOS Tests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				09110A6819805F4800D175E4 /* Debug */,
+				09110A6919805F4800D175E4 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		095981E019806A7900807DBE /* Build configuration list for PBXNativeTarget "OHHTTPStubs Mac Framework" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				095981E119806A7900807DBE /* Debug */,
+				095981E219806A7900807DBE /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		095981E319806A7900807DBE /* Build configuration list for PBXNativeTarget "OHHTTPStubs Mac Tests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				095981E419806A7900807DBE /* Debug */,
+				095981E519806A7900807DBE /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		725CD9B21A9EB65200F84C8B /* Build configuration list for PBXNativeTarget "OHHTTPStubs iOS Framework" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				725CD9AE1A9EB65200F84C8B /* Debug */,
+				725CD9AF1A9EB65200F84C8B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 09110A3919805F4800D175E4 /* Project object */;
+}
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 000000000..25fccc6ba
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:OHHTTPStubs.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs Mac Framework.xcscheme b/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs Mac Framework.xcscheme
new file mode 100644
index 000000000..d9a07a32f
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs Mac Framework.xcscheme	
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0630"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "095981C119806A7900807DBE"
+               BuildableName = "OHHTTPStubs.framework"
+               BlueprintName = "OHHTTPStubs Mac Framework"
+               ReferencedContainer = "container:OHHTTPStubs.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "095981D119806A7900807DBE"
+               BuildableName = "OHHTTPStubs Mac Tests.xctest"
+               BlueprintName = "OHHTTPStubs Mac Tests"
+               ReferencedContainer = "container:OHHTTPStubs.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "095981D119806A7900807DBE"
+               BuildableName = "OHHTTPStubs Mac Tests.xctest"
+               BlueprintName = "OHHTTPStubs Mac Tests"
+               ReferencedContainer = "container:OHHTTPStubs.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "095981C119806A7900807DBE"
+            BuildableName = "OHHTTPStubs.framework"
+            BlueprintName = "OHHTTPStubs Mac Framework"
+            ReferencedContainer = "container:OHHTTPStubs.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS Framework.xcscheme b/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS Framework.xcscheme
new file mode 100644
index 000000000..92fa01674
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS Framework.xcscheme	
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0630"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "725CD99A1A9EB65100F84C8B"
+               BuildableName = "OHHTTPStubs.framework"
+               BlueprintName = "OHHTTPStubs iOS Framework"
+               ReferencedContainer = "container:OHHTTPStubs.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "725CD99A1A9EB65100F84C8B"
+            BuildableName = "OHHTTPStubs.framework"
+            BlueprintName = "OHHTTPStubs iOS Framework"
+            ReferencedContainer = "container:OHHTTPStubs.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "725CD99A1A9EB65100F84C8B"
+            BuildableName = "OHHTTPStubs.framework"
+            BlueprintName = "OHHTTPStubs iOS Framework"
+            ReferencedContainer = "container:OHHTTPStubs.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "725CD99A1A9EB65100F84C8B"
+            BuildableName = "OHHTTPStubs.framework"
+            BlueprintName = "OHHTTPStubs iOS Framework"
+            ReferencedContainer = "container:OHHTTPStubs.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS StaticLib.xcscheme b/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS StaticLib.xcscheme
new file mode 100644
index 000000000..ae7c69efd
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS StaticLib.xcscheme	
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0630"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "09110A4019805F4800D175E4"
+               BuildableName = "libOHHTTPStubs.a"
+               BlueprintName = "OHHTTPStubs iOS StaticLib"
+               ReferencedContainer = "container:OHHTTPStubs.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "09110A5019805F4800D175E4"
+               BuildableName = "OHHTTPStubs iOS Tests.xctest"
+               BlueprintName = "OHHTTPStubs iOS Tests"
+               ReferencedContainer = "container:OHHTTPStubs.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "09110A5019805F4800D175E4"
+               BuildableName = "OHHTTPStubs iOS Tests.xctest"
+               BlueprintName = "OHHTTPStubs iOS Tests"
+               ReferencedContainer = "container:OHHTTPStubs.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "09110A4019805F4800D175E4"
+            BuildableName = "libOHHTTPStubs.a"
+            BlueprintName = "OHHTTPStubs iOS StaticLib"
+            ReferencedContainer = "container:OHHTTPStubs.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcworkspace/contents.xcworkspacedata b/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 000000000..06ceb62b6
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:OHHTTPStubs.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Podfile b/test/ios/OHHTTPStubs/OHHTTPStubs/Podfile
new file mode 100644
index 000000000..5e37ca872
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Podfile
@@ -0,0 +1,14 @@
+source 'https://github.com/CocoaPods/Specs.git'
+
+xcodeproj 'OHHTTPStubs.xcodeproj'
+inhibit_all_warnings!
+
+target 'OHHTTPStubs iOS Tests' do
+    platform :ios, '6.0'
+    pod 'AFNetworking', '2.5.0'
+end
+
+target 'OHHTTPStubs Mac Tests' do
+    platform :osx, '10.8'
+    pod 'AFNetworking', '2.5.0'
+end
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Podfile.lock b/test/ios/OHHTTPStubs/OHHTTPStubs/Podfile.lock
new file mode 100644
index 000000000..c3fbbd33b
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Podfile.lock
@@ -0,0 +1,30 @@
+PODS:
+  - AFNetworking (2.5.0):
+    - AFNetworking/NSURLConnection (= 2.5.0)
+    - AFNetworking/NSURLSession (= 2.5.0)
+    - AFNetworking/Reachability (= 2.5.0)
+    - AFNetworking/Security (= 2.5.0)
+    - AFNetworking/Serialization (= 2.5.0)
+    - AFNetworking/UIKit (= 2.5.0)
+  - AFNetworking/NSURLConnection (2.5.0):
+    - AFNetworking/Reachability
+    - AFNetworking/Security
+    - AFNetworking/Serialization
+  - AFNetworking/NSURLSession (2.5.0):
+    - AFNetworking/Reachability
+    - AFNetworking/Security
+    - AFNetworking/Serialization
+  - AFNetworking/Reachability (2.5.0)
+  - AFNetworking/Security (2.5.0)
+  - AFNetworking/Serialization (2.5.0)
+  - AFNetworking/UIKit (2.5.0):
+    - AFNetworking/NSURLConnection
+    - AFNetworking/NSURLSession
+
+DEPENDENCIES:
+  - AFNetworking (= 2.5.0)
+
+SPEC CHECKSUMS:
+  AFNetworking: 96ac9bf3eda33582701cb1fcc5b896aa1e20311e
+
+COCOAPODS: 0.37.0
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperation.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperation.h
new file mode 100644
index 000000000..dfa82f669
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperation.h
@@ -0,0 +1,67 @@
+// AFHTTPRequestOperation.h
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import <Foundation/Foundation.h>
+#import "AFURLConnectionOperation.h"
+
+/**
+ `AFHTTPRequestOperation` is a subclass of `AFURLConnectionOperation` for requests using the HTTP or HTTPS protocols. It encapsulates the concept of acceptable status codes and content types, which determine the success or failure of a request.
+ */
+@interface AFHTTPRequestOperation : AFURLConnectionOperation
+
+///------------------------------------------------
+/// @name Getting HTTP URL Connection Information
+///------------------------------------------------
+
+/**
+ The last HTTP response received by the operation's connection.
+ */
+@property (readonly, nonatomic, strong) NSHTTPURLResponse *response;
+
+/**
+ Responses sent from the server in data tasks created with `dataTaskWithRequest:success:failure:` and run using the `GET` / `POST` / et al. convenience methods are automatically validated and serialized by the response serializer. By default, this property is set to an AFHTTPResponse serializer, which uses the raw data as its response object. The serializer validates the status code to be in the `2XX` range, denoting success. If the response serializer generates an error in `-responseObjectForResponse:data:error:`, the `failure` callback of the session task or request operation will be executed; otherwise, the `success` callback will be executed.
+
+ @warning `responseSerializer` must not be `nil`. Setting a response serializer will clear out any cached value 
+ */
+@property (nonatomic, strong) AFHTTPResponseSerializer <AFURLResponseSerialization> * responseSerializer;
+
+/**
+ An object constructed by the `responseSerializer` from the response and response data. Returns `nil` unless the operation `isFinished`, has a `response`, and has `responseData` with non-zero content length. If an error occurs during serialization, `nil` will be returned, and the `error` property will be populated with the serialization error.
+ */
+@property (readonly, nonatomic, strong) id responseObject;
+
+///-----------------------------------------------------------
+/// @name Setting Completion Block Success / Failure Callbacks
+///-----------------------------------------------------------
+
+/**
+ Sets the `completionBlock` property with a block that executes either the specified success or failure block, depending on the state of the request on completion. If `error` returns a value, which can be caused by an unacceptable status code or content type, then `failure` is executed. Otherwise, `success` is executed.
+
+ This method should be overridden in subclasses in order to specify the response object passed into the success block.
+ 
+ @param success The block to be executed on the completion of a successful request. This block has no return value and takes two arguments: the receiver operation and the object constructed from the response data of the request.
+ @param failure The block to be executed on the completion of an unsuccessful request. This block has no return value and takes two arguments: the receiver operation and the error that occurred during the request.
+ */
+- (void)setCompletionBlockWithSuccess:(void (^)(AFHTTPRequestOperation *operation, id responseObject))success
+                              failure:(void (^)(AFHTTPRequestOperation *operation, NSError *error))failure;
+
+@end
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperation.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperation.m
new file mode 100644
index 000000000..1de5812ca
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperation.m
@@ -0,0 +1,206 @@
+// AFHTTPRequestOperation.m
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import "AFHTTPRequestOperation.h"
+
+static dispatch_queue_t http_request_operation_processing_queue() {
+    static dispatch_queue_t af_http_request_operation_processing_queue;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        af_http_request_operation_processing_queue = dispatch_queue_create("com.alamofire.networking.http-request.processing", DISPATCH_QUEUE_CONCURRENT);
+    });
+
+    return af_http_request_operation_processing_queue;
+}
+
+static dispatch_group_t http_request_operation_completion_group() {
+    static dispatch_group_t af_http_request_operation_completion_group;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        af_http_request_operation_completion_group = dispatch_group_create();
+    });
+
+    return af_http_request_operation_completion_group;
+}
+
+#pragma mark -
+
+@interface AFURLConnectionOperation ()
+@property (readwrite, nonatomic, strong) NSURLRequest *request;
+@property (readwrite, nonatomic, strong) NSURLResponse *response;
+@end
+
+@interface AFHTTPRequestOperation ()
+@property (readwrite, nonatomic, strong) NSHTTPURLResponse *response;
+@property (readwrite, nonatomic, strong) id responseObject;
+@property (readwrite, nonatomic, strong) NSError *responseSerializationError;
+@property (readwrite, nonatomic, strong) NSRecursiveLock *lock;
+@end
+
+@implementation AFHTTPRequestOperation
+@dynamic lock;
+
+- (instancetype)initWithRequest:(NSURLRequest *)urlRequest {
+    self = [super initWithRequest:urlRequest];
+    if (!self) {
+        return nil;
+    }
+
+    self.responseSerializer = [AFHTTPResponseSerializer serializer];
+
+    return self;
+}
+
+- (void)setResponseSerializer:(AFHTTPResponseSerializer <AFURLResponseSerialization> *)responseSerializer {
+    NSParameterAssert(responseSerializer);
+
+    [self.lock lock];
+    _responseSerializer = responseSerializer;
+    self.responseObject = nil;
+    self.responseSerializationError = nil;
+    [self.lock unlock];
+}
+
+- (id)responseObject {
+    [self.lock lock];
+    if (!_responseObject && [self isFinished] && !self.error) {
+        NSError *error = nil;
+        self.responseObject = [self.responseSerializer responseObjectForResponse:self.response data:self.responseData error:&error];
+        if (error) {
+            self.responseSerializationError = error;
+        }
+    }
+    [self.lock unlock];
+
+    return _responseObject;
+}
+
+- (NSError *)error {
+    if (_responseSerializationError) {
+        return _responseSerializationError;
+    } else {
+        return [super error];
+    }
+}
+
+#pragma mark - AFHTTPRequestOperation
+
+- (void)setCompletionBlockWithSuccess:(void (^)(AFHTTPRequestOperation *operation, id responseObject))success
+                              failure:(void (^)(AFHTTPRequestOperation *operation, NSError *error))failure
+{
+    // completionBlock is manually nilled out in AFURLConnectionOperation to break the retain cycle.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-retain-cycles"
+#pragma clang diagnostic ignored "-Wgnu"
+    self.completionBlock = ^{
+        if (self.completionGroup) {
+            dispatch_group_enter(self.completionGroup);
+        }
+
+        dispatch_async(http_request_operation_processing_queue(), ^{
+            if (self.error) {
+                if (failure) {
+                    dispatch_group_async(self.completionGroup ?: http_request_operation_completion_group(), self.completionQueue ?: dispatch_get_main_queue(), ^{
+                        failure(self, self.error);
+                    });
+                }
+            } else {
+                id responseObject = self.responseObject;
+                if (self.error) {
+                    if (failure) {
+                        dispatch_group_async(self.completionGroup ?: http_request_operation_completion_group(), self.completionQueue ?: dispatch_get_main_queue(), ^{
+                            failure(self, self.error);
+                        });
+                    }
+                } else {
+                    if (success) {
+                        dispatch_group_async(self.completionGroup ?: http_request_operation_completion_group(), self.completionQueue ?: dispatch_get_main_queue(), ^{
+                            success(self, responseObject);
+                        });
+                    }
+                }
+            }
+
+            if (self.completionGroup) {
+                dispatch_group_leave(self.completionGroup);
+            }
+        });
+    };
+#pragma clang diagnostic pop
+}
+
+#pragma mark - AFURLRequestOperation
+
+- (void)pause {
+    [super pause];
+
+    u_int64_t offset = 0;
+    if ([self.outputStream propertyForKey:NSStreamFileCurrentOffsetKey]) {
+        offset = [(NSNumber *)[self.outputStream propertyForKey:NSStreamFileCurrentOffsetKey] unsignedLongLongValue];
+    } else {
+        offset = [(NSData *)[self.outputStream propertyForKey:NSStreamDataWrittenToMemoryStreamKey] length];
+    }
+
+    NSMutableURLRequest *mutableURLRequest = [self.request mutableCopy];
+    if ([self.response respondsToSelector:@selector(allHeaderFields)] && [[self.response allHeaderFields] valueForKey:@"ETag"]) {
+        [mutableURLRequest setValue:[[self.response allHeaderFields] valueForKey:@"ETag"] forHTTPHeaderField:@"If-Range"];
+    }
+    [mutableURLRequest setValue:[NSString stringWithFormat:@"bytes=%llu-", offset] forHTTPHeaderField:@"Range"];
+    self.request = mutableURLRequest;
+}
+
+#pragma mark - NSSecureCoding
+
++ (BOOL)supportsSecureCoding {
+    return YES;
+}
+
+- (id)initWithCoder:(NSCoder *)decoder {
+    self = [super initWithCoder:decoder];
+    if (!self) {
+        return nil;
+    }
+
+    self.responseSerializer = [decoder decodeObjectOfClass:[AFHTTPResponseSerializer class] forKey:NSStringFromSelector(@selector(responseSerializer))];
+
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+    [super encodeWithCoder:coder];
+
+    [coder encodeObject:self.responseSerializer forKey:NSStringFromSelector(@selector(responseSerializer))];
+}
+
+#pragma mark - NSCopying
+
+- (id)copyWithZone:(NSZone *)zone {
+    AFHTTPRequestOperation *operation = [super copyWithZone:zone];
+
+    operation.responseSerializer = [self.responseSerializer copyWithZone:zone];
+    operation.completionQueue = self.completionQueue;
+    operation.completionGroup = self.completionGroup;
+
+    return operation;
+}
+
+@end
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperationManager.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperationManager.h
new file mode 100644
index 000000000..9f390294e
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperationManager.h
@@ -0,0 +1,308 @@
+// AFHTTPRequestOperationManager.h
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import <Foundation/Foundation.h>
+#import <SystemConfiguration/SystemConfiguration.h>
+#import <Availability.h>
+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED
+#import <MobileCoreServices/MobileCoreServices.h>
+#else
+#import <CoreServices/CoreServices.h>
+#endif
+
+#import "AFHTTPRequestOperation.h"
+#import "AFURLResponseSerialization.h"
+#import "AFURLRequestSerialization.h"
+#import "AFSecurityPolicy.h"
+#import "AFNetworkReachabilityManager.h"
+
+/**
+ `AFHTTPRequestOperationManager` encapsulates the common patterns of communicating with a web application over HTTP, including request creation, response serialization, network reachability monitoring, and security, as well as request operation management.
+
+ ## Subclassing Notes
+ 
+ Developers targeting iOS 7 or Mac OS X 10.9 or later that deal extensively with a web service are encouraged to subclass `AFHTTPSessionManager`, providing a class method that returns a shared singleton object on which authentication and other configuration can be shared across the application.
+ 
+ For developers targeting iOS 6 or Mac OS X 10.8 or earlier, `AFHTTPRequestOperationManager` may be used to similar effect.
+ 
+ ## Methods to Override
+
+ To change the behavior of all request operation construction for an `AFHTTPRequestOperationManager` subclass, override `HTTPRequestOperationWithRequest:success:failure`.
+
+ ## Serialization
+ 
+ Requests created by an HTTP client will contain default headers and encode parameters according to the `requestSerializer` property, which is an object conforming to `<AFURLRequestSerialization>`. 
+ 
+ Responses received from the server are automatically validated and serialized by the `responseSerializers` property, which is an object conforming to `<AFURLResponseSerialization>`
+
+ ## URL Construction Using Relative Paths
+
+ For HTTP convenience methods, the request serializer constructs URLs from the path relative to the `-baseURL`, using `NSURL +URLWithString:relativeToURL:`, when provided. If `baseURL` is `nil`, `path` needs to resolve to a valid `NSURL` object using `NSURL +URLWithString:`.
+
+ Below are a few examples of how `baseURL` and relative paths interact:
+
+    NSURL *baseURL = [NSURL URLWithString:@"http://example.com/v1/"];
+    [NSURL URLWithString:@"foo" relativeToURL:baseURL];                  // http://example.com/v1/foo
+    [NSURL URLWithString:@"foo?bar=baz" relativeToURL:baseURL];          // http://example.com/v1/foo?bar=baz
+    [NSURL URLWithString:@"/foo" relativeToURL:baseURL];                 // http://example.com/foo
+    [NSURL URLWithString:@"foo/" relativeToURL:baseURL];                 // http://example.com/v1/foo
+    [NSURL URLWithString:@"/foo/" relativeToURL:baseURL];                // http://example.com/foo/
+    [NSURL URLWithString:@"http://example2.com/" relativeToURL:baseURL]; // http://example2.com/
+
+ Also important to note is that a trailing slash will be added to any `baseURL` without one. This would otherwise cause unexpected behavior when constructing URLs using paths without a leading slash.
+
+ ## Network Reachability Monitoring
+
+ Network reachability status and change monitoring is available through the `reachabilityManager` property. Applications may choose to monitor network reachability conditions in order to prevent or suspend any outbound requests. See `AFNetworkReachabilityManager` for more details.
+
+ ## NSSecureCoding & NSCopying Caveats
+
+ `AFHTTPRequestOperationManager` conforms to the `NSSecureCoding` and `NSCopying` protocols, allowing operations to be archived to disk, and copied in memory, respectively. There are a few minor caveats to keep in mind, however:
+
+ - Archives and copies of HTTP clients will be initialized with an empty operation queue.
+ - NSSecureCoding cannot serialize / deserialize block properties, so an archive of an HTTP client will not include any reachability callback block that may be set.
+ */
+@interface AFHTTPRequestOperationManager : NSObject <NSSecureCoding, NSCopying>
+
+/**
+ The URL used to monitor reachability, and construct requests from relative paths in methods like `requestWithMethod:URLString:parameters:`, and the `GET` / `POST` / et al. convenience methods.
+ */
+@property (readonly, nonatomic, strong) NSURL *baseURL;
+
+/**
+ Requests created with `requestWithMethod:URLString:parameters:` & `multipartFormRequestWithMethod:URLString:parameters:constructingBodyWithBlock:` are constructed with a set of default headers using a parameter serialization specified by this property. By default, this is set to an instance of `AFHTTPRequestSerializer`, which serializes query string parameters for `GET`, `HEAD`, and `DELETE` requests, or otherwise URL-form-encodes HTTP message bodies.
+ 
+ @warning `requestSerializer` must not be `nil`.
+ */
+@property (nonatomic, strong) AFHTTPRequestSerializer <AFURLRequestSerialization> * requestSerializer;
+
+/**
+ Responses sent from the server in data tasks created with `dataTaskWithRequest:success:failure:` and run using the `GET` / `POST` / et al. convenience methods are automatically validated and serialized by the response serializer. By default, this property is set to a JSON serializer, which serializes data from responses with a `application/json` MIME type, and falls back to the raw data object. The serializer validates the status code to be in the `2XX` range, denoting success. If the response serializer generates an error in `-responseObjectForResponse:data:error:`, the `failure` callback of the session task or request operation will be executed; otherwise, the `success` callback will be executed.
+
+ @warning `responseSerializer` must not be `nil`.
+ */
+@property (nonatomic, strong) AFHTTPResponseSerializer <AFURLResponseSerialization> * responseSerializer;
+
+/**
+ The operation queue on which request operations are scheduled and run.
+ */
+@property (nonatomic, strong) NSOperationQueue *operationQueue;
+
+///-------------------------------
+/// @name Managing URL Credentials
+///-------------------------------
+
+/**
+ Whether request operations should consult the credential storage for authenticating the connection. `YES` by default.
+
+ @see AFURLConnectionOperation -shouldUseCredentialStorage
+ */
+@property (nonatomic, assign) BOOL shouldUseCredentialStorage;
+
+/**
+ The credential used by request operations for authentication challenges.
+
+ @see AFURLConnectionOperation -credential
+ */
+@property (nonatomic, strong) NSURLCredential *credential;
+
+///-------------------------------
+/// @name Managing Security Policy
+///-------------------------------
+
+/**
+ The security policy used by created request operations to evaluate server trust for secure connections. `AFHTTPRequestOperationManager` uses the `defaultPolicy` unless otherwise specified.
+ */
+@property (nonatomic, strong) AFSecurityPolicy *securityPolicy;
+
+///------------------------------------
+/// @name Managing Network Reachability
+///------------------------------------
+
+/**
+ The network reachability manager. `AFHTTPRequestOperationManager` uses the `sharedManager` by default.
+ */
+@property (readwrite, nonatomic, strong) AFNetworkReachabilityManager *reachabilityManager;
+
+///-------------------------------
+/// @name Managing Callback Queues
+///-------------------------------
+
+/**
+ The dispatch queue for the `completionBlock` of request operations. If `NULL` (default), the main queue is used.
+ */
+@property (nonatomic, strong) dispatch_queue_t completionQueue;
+
+/**
+ The dispatch group for the `completionBlock` of request operations. If `NULL` (default), a private dispatch group is used.
+ */
+@property (nonatomic, strong) dispatch_group_t completionGroup;
+
+///---------------------------------------------
+/// @name Creating and Initializing HTTP Clients
+///---------------------------------------------
+
+/**
+ Creates and returns an `AFHTTPRequestOperationManager` object.
+ */
++ (instancetype)manager;
+
+/**
+ Initializes an `AFHTTPRequestOperationManager` object with the specified base URL.
+ 
+ This is the designated initializer.
+ 
+ @param url The base URL for the HTTP client.
+
+ @return The newly-initialized HTTP client
+ */
+- (instancetype)initWithBaseURL:(NSURL *)url;
+
+///---------------------------------------
+/// @name Managing HTTP Request Operations
+///---------------------------------------
+
+/**
+ Creates an `AFHTTPRequestOperation`, and sets the response serializers to that of the HTTP client.
+
+ @param request The request object to be loaded asynchronously during execution of the operation.
+ @param success A block object to be executed when the request operation finishes successfully. This block has no return value and takes two arguments: the created request operation and the object created from the response data of request.
+ @param failure A block object to be executed when the request operation finishes unsuccessfully, or that finishes successfully, but encountered an error while parsing the response data. This block has no return value and takes two arguments:, the created request operation and the `NSError` object describing the network or parsing error that occurred.
+ */
+- (AFHTTPRequestOperation *)HTTPRequestOperationWithRequest:(NSURLRequest *)request
+                                                    success:(void (^)(AFHTTPRequestOperation *operation, id responseObject))success
+                                                    failure:(void (^)(AFHTTPRequestOperation *operation, NSError *error))failure;
+
+///---------------------------
+/// @name Making HTTP Requests
+///---------------------------
+
+/**
+ Creates and runs an `AFHTTPRequestOperation` with a `GET` request.
+
+ @param URLString The URL string used to create the request URL.
+ @param parameters The parameters to be encoded according to the client request serializer.
+ @param success A block object to be executed when the request operation finishes successfully. This block has no return value and takes two arguments: the request operation, and the response object created by the client response serializer.
+ @param failure A block object to be executed when the request operation finishes unsuccessfully, or that finishes successfully, but encountered an error while parsing the response data. This block has no return value and takes a two arguments: the request operation and the error describing the network or parsing error that occurred.
+
+ @see -HTTPRequestOperationWithRequest:success:failure:
+ */
+- (AFHTTPRequestOperation *)GET:(NSString *)URLString
+                     parameters:(id)parameters
+                        success:(void (^)(AFHTTPRequestOperation *operation, id responseObject))success
+                        failure:(void (^)(AFHTTPRequestOperation *operation, NSError *error))failure;
+
+/**
+ Creates and runs an `AFHTTPRequestOperation` with a `HEAD` request.
+
+ @param URLString The URL string used to create the request URL.
+ @param parameters The parameters to be encoded according to the client request serializer.
+ @param success A block object to be executed when the request operation finishes successfully. This block has no return value and takes a single arguments: the request operation.
+ @param failure A block object to be executed when the request operation finishes unsuccessfully, or that finishes successfully, but encountered an error while parsing the response data. This block has no return value and takes a two arguments: the request operation and the error describing the network or parsing error that occurred.
+
+ @see -HTTPRequestOperationWithRequest:success:failure:
+ */
+- (AFHTTPRequestOperation *)HEAD:(NSString *)URLString
+                      parameters:(id)parameters
+                         success:(void (^)(AFHTTPRequestOperation *operation))success
+                         failure:(void (^)(AFHTTPRequestOperation *operation, NSError *error))failure;
+
+/**
+ Creates and runs an `AFHTTPRequestOperation` with a `POST` request.
+
+ @param URLString The URL string used to create the request URL.
+ @param parameters The parameters to be encoded according to the client request serializer.
+ @param success A block object to be executed when the request operation finishes successfully. This block has no return value and takes two arguments: the request operation, and the response object created by the client response serializer.
+ @param failure A block object to be executed when the request operation finishes unsuccessfully, or that finishes successfully, but encountered an error while parsing the response data. This block has no return value and takes a two arguments: the request operation and the error describing the network or parsing error that occurred.
+
+ @see -HTTPRequestOperationWithRequest:success:failure:
+ */
+- (AFHTTPRequestOperation *)POST:(NSString *)URLString
+                      parameters:(id)parameters
+                         success:(void (^)(AFHTTPRequestOperation *operation, id responseObject))success
+                         failure:(void (^)(AFHTTPRequestOperation *operation, NSError *error))failure;
+
+/**
+ Creates and runs an `AFHTTPRequestOperation` with a multipart `POST` request.
+
+ @param URLString The URL string used to create the request URL.
+ @param parameters The parameters to be encoded according to the client request serializer.
+ @param block A block that takes a single argument and appends data to the HTTP body. The block argument is an object adopting the `AFMultipartFormData` protocol.
+ @param success A block object to be executed when the request operation finishes successfully. This block has no return value and takes two arguments: the request operation, and the response object created by the client response serializer.
+ @param failure A block object to be executed when the request operation finishes unsuccessfully, or that finishes successfully, but encountered an error while parsing the response data. This block has no return value and takes a two arguments: the request operation and the error describing the network or parsing error that occurred.
+
+ @see -HTTPRequestOperationWithRequest:success:failure:
+ */
+- (AFHTTPRequestOperation *)POST:(NSString *)URLString
+                      parameters:(id)parameters
+       constructingBodyWithBlock:(void (^)(id <AFMultipartFormData> formData))block
+                         success:(void (^)(AFHTTPRequestOperation *operation, id responseObject))success
+                         failure:(void (^)(AFHTTPRequestOperation *operation, NSError *error))failure;
+
+/**
+ Creates and runs an `AFHTTPRequestOperation` with a `PUT` request.
+
+ @param URLString The URL string used to create the request URL.
+ @param parameters The parameters to be encoded according to the client request serializer.
+ @param success A block object to be executed when the request operation finishes successfully. This block has no return value and takes two arguments: the request operation, and the response object created by the client response serializer.
+ @param failure A block object to be executed when the request operation finishes unsuccessfully, or that finishes successfully, but encountered an error while parsing the response data. This block has no return value and takes a two arguments: the request operation and the error describing the network or parsing error that occurred.
+
+ @see -HTTPRequestOperationWithRequest:success:failure:
+ */
+- (AFHTTPRequestOperation *)PUT:(NSString *)URLString
+                     parameters:(id)parameters
+                        success:(void (^)(AFHTTPRequestOperation *operation, id responseObject))success
+                        failure:(void (^)(AFHTTPRequestOperation *operation, NSError *error))failure;
+
+/**
+ Creates and runs an `AFHTTPRequestOperation` with a `PATCH` request.
+
+ @param URLString The URL string used to create the request URL.
+ @param parameters The parameters to be encoded according to the client request serializer.
+ @param success A block object to be executed when the request operation finishes successfully. This block has no return value and takes two arguments: the request operation, and the response object created by the client response serializer.
+ @param failure A block object to be executed when the request operation finishes unsuccessfully, or that finishes successfully, but encountered an error while parsing the response data. This block has no return value and takes a two arguments: the request operation and the error describing the network or parsing error that occurred.
+
+ @see -HTTPRequestOperationWithRequest:success:failure:
+ */
+- (AFHTTPRequestOperation *)PATCH:(NSString *)URLString
+                       parameters:(id)parameters
+                          success:(void (^)(AFHTTPRequestOperation *operation, id responseObject))success
+                          failure:(void (^)(AFHTTPRequestOperation *operation, NSError *error))failure;
+
+/**
+ Creates and runs an `AFHTTPRequestOperation` with a `DELETE` request.
+
+ @param URLString The URL string used to create the request URL.
+ @param parameters The parameters to be encoded according to the client request serializer.
+ @param success A block object to be executed when the request operation finishes successfully. This block has no return value and takes two arguments: the request operation, and the response object created by the client response serializer.
+ @param failure A block object to be executed when the request operation finishes unsuccessfully, or that finishes successfully, but encountered an error while parsing the response data. This block has no return value and takes a two arguments: the request operation and the error describing the network or parsing error that occurred.
+
+ @see -HTTPRequestOperationWithRequest:success:failure:
+ */
+- (AFHTTPRequestOperation *)DELETE:(NSString *)URLString
+                        parameters:(id)parameters
+                           success:(void (^)(AFHTTPRequestOperation *operation, id responseObject))success
+                           failure:(void (^)(AFHTTPRequestOperation *operation, NSError *error))failure;
+
+@end
+
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperationManager.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperationManager.m
new file mode 100644
index 000000000..4ae727548
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperationManager.m
@@ -0,0 +1,253 @@
+// AFHTTPRequestOperationManager.m
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import <Foundation/Foundation.h>
+
+#import "AFHTTPRequestOperationManager.h"
+#import "AFHTTPRequestOperation.h"
+
+#import <Availability.h>
+#import <Security/Security.h>
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+#import <UIKit/UIKit.h>
+#endif
+
+@interface AFHTTPRequestOperationManager ()
+@property (readwrite, nonatomic, strong) NSURL *baseURL;
+@end
+
+@implementation AFHTTPRequestOperationManager
+
++ (instancetype)manager {
+    return [[self alloc] initWithBaseURL:nil];
+}
+
+- (instancetype)init {
+    return [self initWithBaseURL:nil];    
+}
+
+- (instancetype)initWithBaseURL:(NSURL *)url {
+    self = [super init];
+    if (!self) {
+        return nil;
+    }
+
+    // Ensure terminal slash for baseURL path, so that NSURL +URLWithString:relativeToURL: works as expected
+    if ([[url path] length] > 0 && ![[url absoluteString] hasSuffix:@"/"]) {
+        url = [url URLByAppendingPathComponent:@""];
+    }
+
+    self.baseURL = url;
+
+    self.requestSerializer = [AFHTTPRequestSerializer serializer];
+    self.responseSerializer = [AFJSONResponseSerializer serializer];
+
+    self.securityPolicy = [AFSecurityPolicy defaultPolicy];
+
+    self.reachabilityManager = [AFNetworkReachabilityManager sharedManager];
+
+    self.operationQueue = [[NSOperationQueue alloc] init];
+
+    self.shouldUseCredentialStorage = YES;
+
+    return self;
+}
+
+#pragma mark -
+
+#ifdef _SYSTEMCONFIGURATION_H
+#endif
+
+- (void)setRequestSerializer:(AFHTTPRequestSerializer <AFURLRequestSerialization> *)requestSerializer {
+    NSParameterAssert(requestSerializer);
+
+    _requestSerializer = requestSerializer;
+}
+
+- (void)setResponseSerializer:(AFHTTPResponseSerializer <AFURLResponseSerialization> *)responseSerializer {
+    NSParameterAssert(responseSerializer);
+
+    _responseSerializer = responseSerializer;
+}
+
+#pragma mark -
+
+- (AFHTTPRequestOperation *)HTTPRequestOperationWithRequest:(NSURLRequest *)request
+                                                    success:(void (^)(AFHTTPRequestOperation *operation, id responseObject))success
+                                                    failure:(void (^)(AFHTTPRequestOperation *operation, NSError *error))failure
+{
+    AFHTTPRequestOperation *operation = [[AFHTTPRequestOperation alloc] initWithRequest:request];
+    operation.responseSerializer = self.responseSerializer;
+    operation.shouldUseCredentialStorage = self.shouldUseCredentialStorage;
+    operation.credential = self.credential;
+    operation.securityPolicy = self.securityPolicy;
+
+    [operation setCompletionBlockWithSuccess:success failure:failure];
+    operation.completionQueue = self.completionQueue;
+    operation.completionGroup = self.completionGroup;
+
+    return operation;
+}
+
+#pragma mark -
+
+- (AFHTTPRequestOperation *)GET:(NSString *)URLString
+                     parameters:(id)parameters
+                        success:(void (^)(AFHTTPRequestOperation *operation, id responseObject))success
+                        failure:(void (^)(AFHTTPRequestOperation *operation, NSError *error))failure
+{
+    NSMutableURLRequest *request = [self.requestSerializer requestWithMethod:@"GET" URLString:[[NSURL URLWithString:URLString relativeToURL:self.baseURL] absoluteString] parameters:parameters error:nil];
+    AFHTTPRequestOperation *operation = [self HTTPRequestOperationWithRequest:request success:success failure:failure];
+
+    [self.operationQueue addOperation:operation];
+
+    return operation;
+}
+
+- (AFHTTPRequestOperation *)HEAD:(NSString *)URLString
+                      parameters:(id)parameters
+                         success:(void (^)(AFHTTPRequestOperation *operation))success
+                         failure:(void (^)(AFHTTPRequestOperation *operation, NSError *error))failure
+{
+    NSMutableURLRequest *request = [self.requestSerializer requestWithMethod:@"HEAD" URLString:[[NSURL URLWithString:URLString relativeToURL:self.baseURL] absoluteString] parameters:parameters error:nil];
+    AFHTTPRequestOperation *operation = [self HTTPRequestOperationWithRequest:request success:^(AFHTTPRequestOperation *requestOperation, __unused id responseObject) {
+        if (success) {
+            success(requestOperation);
+        }
+    } failure:failure];
+
+    [self.operationQueue addOperation:operation];
+
+    return operation;
+}
+
+- (AFHTTPRequestOperation *)POST:(NSString *)URLString
+                      parameters:(id)parameters
+                         success:(void (^)(AFHTTPRequestOperation *operation, id responseObject))success
+                         failure:(void (^)(AFHTTPRequestOperation *operation, NSError *error))failure
+{
+    NSMutableURLRequest *request = [self.requestSerializer requestWithMethod:@"POST" URLString:[[NSURL URLWithString:URLString relativeToURL:self.baseURL] absoluteString] parameters:parameters error:nil];
+    AFHTTPRequestOperation *operation = [self HTTPRequestOperationWithRequest:request success:success failure:failure];
+
+    [self.operationQueue addOperation:operation];
+
+    return operation;
+}
+
+- (AFHTTPRequestOperation *)POST:(NSString *)URLString
+                      parameters:(id)parameters
+       constructingBodyWithBlock:(void (^)(id <AFMultipartFormData> formData))block
+                         success:(void (^)(AFHTTPRequestOperation *operation, id responseObject))success
+                         failure:(void (^)(AFHTTPRequestOperation *operation, NSError *error))failure
+{
+    NSMutableURLRequest *request = [self.requestSerializer multipartFormRequestWithMethod:@"POST" URLString:[[NSURL URLWithString:URLString relativeToURL:self.baseURL] absoluteString] parameters:parameters constructingBodyWithBlock:block error:nil];
+    AFHTTPRequestOperation *operation = [self HTTPRequestOperationWithRequest:request success:success failure:failure];
+
+    [self.operationQueue addOperation:operation];
+
+    return operation;
+}
+
+- (AFHTTPRequestOperation *)PUT:(NSString *)URLString
+                     parameters:(id)parameters
+                        success:(void (^)(AFHTTPRequestOperation *operation, id responseObject))success
+                        failure:(void (^)(AFHTTPRequestOperation *operation, NSError *error))failure
+{
+    NSMutableURLRequest *request = [self.requestSerializer requestWithMethod:@"PUT" URLString:[[NSURL URLWithString:URLString relativeToURL:self.baseURL] absoluteString] parameters:parameters error:nil];
+    AFHTTPRequestOperation *operation = [self HTTPRequestOperationWithRequest:request success:success failure:failure];
+
+    [self.operationQueue addOperation:operation];
+
+    return operation;
+}
+
+- (AFHTTPRequestOperation *)PATCH:(NSString *)URLString
+                       parameters:(id)parameters
+                          success:(void (^)(AFHTTPRequestOperation *operation, id responseObject))success
+                          failure:(void (^)(AFHTTPRequestOperation *operation, NSError *error))failure
+{
+    NSMutableURLRequest *request = [self.requestSerializer requestWithMethod:@"PATCH" URLString:[[NSURL URLWithString:URLString relativeToURL:self.baseURL] absoluteString] parameters:parameters error:nil];
+    AFHTTPRequestOperation *operation = [self HTTPRequestOperationWithRequest:request success:success failure:failure];
+
+    [self.operationQueue addOperation:operation];
+
+    return operation;
+}
+
+- (AFHTTPRequestOperation *)DELETE:(NSString *)URLString
+                        parameters:(id)parameters
+                           success:(void (^)(AFHTTPRequestOperation *operation, id responseObject))success
+                           failure:(void (^)(AFHTTPRequestOperation *operation, NSError *error))failure
+{
+    NSMutableURLRequest *request = [self.requestSerializer requestWithMethod:@"DELETE" URLString:[[NSURL URLWithString:URLString relativeToURL:self.baseURL] absoluteString] parameters:parameters error:nil];
+    AFHTTPRequestOperation *operation = [self HTTPRequestOperationWithRequest:request success:success failure:failure];
+
+    [self.operationQueue addOperation:operation];
+
+    return operation;
+}
+
+#pragma mark - NSObject
+
+- (NSString *)description {
+    return [NSString stringWithFormat:@"<%@: %p, baseURL: %@, operationQueue: %@>", NSStringFromClass([self class]), self, [self.baseURL absoluteString], self.operationQueue];
+}
+
+#pragma mark - NSSecureCoding
+
++ (BOOL)supportsSecureCoding {
+    return YES;
+}
+
+- (id)initWithCoder:(NSCoder *)decoder {
+    NSURL *baseURL = [decoder decodeObjectForKey:NSStringFromSelector(@selector(baseURL))];
+
+    self = [self initWithBaseURL:baseURL];
+    if (!self) {
+        return nil;
+    }
+
+    self.requestSerializer = [decoder decodeObjectOfClass:[AFHTTPRequestSerializer class] forKey:NSStringFromSelector(@selector(requestSerializer))];
+    self.responseSerializer = [decoder decodeObjectOfClass:[AFHTTPResponseSerializer class] forKey:NSStringFromSelector(@selector(responseSerializer))];
+
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+    [coder encodeObject:self.baseURL forKey:NSStringFromSelector(@selector(baseURL))];
+    [coder encodeObject:self.requestSerializer forKey:NSStringFromSelector(@selector(requestSerializer))];
+    [coder encodeObject:self.responseSerializer forKey:NSStringFromSelector(@selector(responseSerializer))];
+}
+
+#pragma mark - NSCopying
+
+- (id)copyWithZone:(NSZone *)zone {
+    AFHTTPRequestOperationManager *HTTPClient = [[[self class] allocWithZone:zone] initWithBaseURL:self.baseURL];
+
+    HTTPClient.requestSerializer = [self.requestSerializer copyWithZone:zone];
+    HTTPClient.responseSerializer = [self.responseSerializer copyWithZone:zone];
+    
+    return HTTPClient;
+}
+
+@end
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPSessionManager.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPSessionManager.h
new file mode 100644
index 000000000..8fed5a689
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPSessionManager.h
@@ -0,0 +1,240 @@
+// AFHTTPSessionManager.h
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import <Foundation/Foundation.h>
+#import <SystemConfiguration/SystemConfiguration.h>
+#import <Availability.h>
+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED
+#import <MobileCoreServices/MobileCoreServices.h>
+#else
+#import <CoreServices/CoreServices.h>
+#endif
+
+#import "AFURLSessionManager.h"
+
+/**
+ `AFHTTPSessionManager` is a subclass of `AFURLSessionManager` with convenience methods for making HTTP requests. When a `baseURL` is provided, requests made with the `GET` / `POST` / et al. convenience methods can be made with relative paths.
+
+ ## Subclassing Notes
+
+ Developers targeting iOS 7 or Mac OS X 10.9 or later that deal extensively with a web service are encouraged to subclass `AFHTTPSessionManager`, providing a class method that returns a shared singleton object on which authentication and other configuration can be shared across the application.
+
+ For developers targeting iOS 6 or Mac OS X 10.8 or earlier, `AFHTTPRequestOperationManager` may be used to similar effect.
+
+ ## Methods to Override
+
+ To change the behavior of all data task operation construction, which is also used in the `GET` / `POST` / et al. convenience methods, override `dataTaskWithRequest:completionHandler:`.
+
+ ## Serialization
+
+ Requests created by an HTTP client will contain default headers and encode parameters according to the `requestSerializer` property, which is an object conforming to `<AFURLRequestSerialization>`.
+
+ Responses received from the server are automatically validated and serialized by the `responseSerializers` property, which is an object conforming to `<AFURLResponseSerialization>`
+
+ ## URL Construction Using Relative Paths
+
+ For HTTP convenience methods, the request serializer constructs URLs from the path relative to the `-baseURL`, using `NSURL +URLWithString:relativeToURL:`, when provided. If `baseURL` is `nil`, `path` needs to resolve to a valid `NSURL` object using `NSURL +URLWithString:`.
+
+ Below are a few examples of how `baseURL` and relative paths interact:
+
+    NSURL *baseURL = [NSURL URLWithString:@"http://example.com/v1/"];
+    [NSURL URLWithString:@"foo" relativeToURL:baseURL];                  // http://example.com/v1/foo
+    [NSURL URLWithString:@"foo?bar=baz" relativeToURL:baseURL];          // http://example.com/v1/foo?bar=baz
+    [NSURL URLWithString:@"/foo" relativeToURL:baseURL];                 // http://example.com/foo
+    [NSURL URLWithString:@"foo/" relativeToURL:baseURL];                 // http://example.com/v1/foo
+    [NSURL URLWithString:@"/foo/" relativeToURL:baseURL];                // http://example.com/foo/
+    [NSURL URLWithString:@"http://example2.com/" relativeToURL:baseURL]; // http://example2.com/
+
+ Also important to note is that a trailing slash will be added to any `baseURL` without one. This would otherwise cause unexpected behavior when constructing URLs using paths without a leading slash.
+
+ @warning Managers for background sessions must be owned for the duration of their use. This can be accomplished by creating an application-wide or shared singleton instance.
+ */
+
+#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000) || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090)
+
+@interface AFHTTPSessionManager : AFURLSessionManager <NSSecureCoding, NSCopying>
+
+/**
+ The URL used to monitor reachability, and construct requests from relative paths in methods like `requestWithMethod:URLString:parameters:`, and the `GET` / `POST` / et al. convenience methods.
+ */
+@property (readonly, nonatomic, strong) NSURL *baseURL;
+
+/**
+ Requests created with `requestWithMethod:URLString:parameters:` & `multipartFormRequestWithMethod:URLString:parameters:constructingBodyWithBlock:` are constructed with a set of default headers using a parameter serialization specified by this property. By default, this is set to an instance of `AFHTTPRequestSerializer`, which serializes query string parameters for `GET`, `HEAD`, and `DELETE` requests, or otherwise URL-form-encodes HTTP message bodies.
+
+ @warning `requestSerializer` must not be `nil`.
+ */
+@property (nonatomic, strong) AFHTTPRequestSerializer <AFURLRequestSerialization> * requestSerializer;
+
+/**
+ Responses sent from the server in data tasks created with `dataTaskWithRequest:success:failure:` and run using the `GET` / `POST` / et al. convenience methods are automatically validated and serialized by the response serializer. By default, this property is set to an instance of `AFJSONResponseSerializer`.
+
+ @warning `responseSerializer` must not be `nil`.
+ */
+@property (nonatomic, strong) AFHTTPResponseSerializer <AFURLResponseSerialization> * responseSerializer;
+
+///---------------------
+/// @name Initialization
+///---------------------
+
+/**
+ Creates and returns an `AFHTTPSessionManager` object.
+ */
++ (instancetype)manager;
+
+/**
+ Initializes an `AFHTTPSessionManager` object with the specified base URL.
+
+ @param url The base URL for the HTTP client.
+
+ @return The newly-initialized HTTP client
+ */
+- (instancetype)initWithBaseURL:(NSURL *)url;
+
+/**
+ Initializes an `AFHTTPSessionManager` object with the specified base URL.
+
+ This is the designated initializer.
+
+ @param url The base URL for the HTTP client.
+ @param configuration The configuration used to create the managed session.
+
+ @return The newly-initialized HTTP client
+ */
+- (instancetype)initWithBaseURL:(NSURL *)url
+           sessionConfiguration:(NSURLSessionConfiguration *)configuration;
+
+///---------------------------
+/// @name Making HTTP Requests
+///---------------------------
+
+/**
+ Creates and runs an `NSURLSessionDataTask` with a `GET` request.
+
+ @param URLString The URL string used to create the request URL.
+ @param parameters The parameters to be encoded according to the client request serializer.
+ @param success A block object to be executed when the task finishes successfully. This block has no return value and takes two arguments: the data task, and the response object created by the client response serializer.
+ @param failure A block object to be executed when the task finishes unsuccessfully, or that finishes successfully, but encountered an error while parsing the response data. This block has no return value and takes a two arguments: the data task and the error describing the network or parsing error that occurred.
+
+ @see -dataTaskWithRequest:completionHandler:
+ */
+- (NSURLSessionDataTask *)GET:(NSString *)URLString
+                   parameters:(id)parameters
+                      success:(void (^)(NSURLSessionDataTask *task, id responseObject))success
+                      failure:(void (^)(NSURLSessionDataTask *task, NSError *error))failure;
+
+/**
+ Creates and runs an `NSURLSessionDataTask` with a `HEAD` request.
+
+ @param URLString The URL string used to create the request URL.
+ @param parameters The parameters to be encoded according to the client request serializer.
+ @param success A block object to be executed when the task finishes successfully. This block has no return value and takes a single arguments: the data task.
+ @param failure A block object to be executed when the task finishes unsuccessfully, or that finishes successfully, but encountered an error while parsing the response data. This block has no return value and takes a two arguments: the data task and the error describing the network or parsing error that occurred.
+
+ @see -dataTaskWithRequest:completionHandler:
+ */
+- (NSURLSessionDataTask *)HEAD:(NSString *)URLString
+                    parameters:(id)parameters
+                       success:(void (^)(NSURLSessionDataTask *task))success
+                       failure:(void (^)(NSURLSessionDataTask *task, NSError *error))failure;
+
+/**
+ Creates and runs an `NSURLSessionDataTask` with a `POST` request.
+
+ @param URLString The URL string used to create the request URL.
+ @param parameters The parameters to be encoded according to the client request serializer.
+ @param success A block object to be executed when the task finishes successfully. This block has no return value and takes two arguments: the data task, and the response object created by the client response serializer.
+ @param failure A block object to be executed when the task finishes unsuccessfully, or that finishes successfully, but encountered an error while parsing the response data. This block has no return value and takes a two arguments: the data task and the error describing the network or parsing error that occurred.
+
+ @see -dataTaskWithRequest:completionHandler:
+ */
+- (NSURLSessionDataTask *)POST:(NSString *)URLString
+                    parameters:(id)parameters
+                       success:(void (^)(NSURLSessionDataTask *task, id responseObject))success
+                       failure:(void (^)(NSURLSessionDataTask *task, NSError *error))failure;
+
+/**
+ Creates and runs an `NSURLSessionDataTask` with a multipart `POST` request.
+
+ @param URLString The URL string used to create the request URL.
+ @param parameters The parameters to be encoded according to the client request serializer.
+ @param block A block that takes a single argument and appends data to the HTTP body. The block argument is an object adopting the `AFMultipartFormData` protocol.
+ @param success A block object to be executed when the task finishes successfully. This block has no return value and takes two arguments: the data task, and the response object created by the client response serializer.
+ @param failure A block object to be executed when the task finishes unsuccessfully, or that finishes successfully, but encountered an error while parsing the response data. This block has no return value and takes a two arguments: the data task and the error describing the network or parsing error that occurred.
+
+ @see -dataTaskWithRequest:completionHandler:
+ */
+- (NSURLSessionDataTask *)POST:(NSString *)URLString
+                    parameters:(id)parameters
+     constructingBodyWithBlock:(void (^)(id <AFMultipartFormData> formData))block
+                       success:(void (^)(NSURLSessionDataTask *task, id responseObject))success
+                       failure:(void (^)(NSURLSessionDataTask *task, NSError *error))failure;
+
+/**
+ Creates and runs an `NSURLSessionDataTask` with a `PUT` request.
+
+ @param URLString The URL string used to create the request URL.
+ @param parameters The parameters to be encoded according to the client request serializer.
+ @param success A block object to be executed when the task finishes successfully. This block has no return value and takes two arguments: the data task, and the response object created by the client response serializer.
+ @param failure A block object to be executed when the task finishes unsuccessfully, or that finishes successfully, but encountered an error while parsing the response data. This block has no return value and takes a two arguments: the data task and the error describing the network or parsing error that occurred.
+
+ @see -dataTaskWithRequest:completionHandler:
+ */
+- (NSURLSessionDataTask *)PUT:(NSString *)URLString
+                   parameters:(id)parameters
+                      success:(void (^)(NSURLSessionDataTask *task, id responseObject))success
+                      failure:(void (^)(NSURLSessionDataTask *task, NSError *error))failure;
+
+/**
+ Creates and runs an `NSURLSessionDataTask` with a `PATCH` request.
+
+ @param URLString The URL string used to create the request URL.
+ @param parameters The parameters to be encoded according to the client request serializer.
+ @param success A block object to be executed when the task finishes successfully. This block has no return value and takes two arguments: the data task, and the response object created by the client response serializer.
+ @param failure A block object to be executed when the task finishes unsuccessfully, or that finishes successfully, but encountered an error while parsing the response data. This block has no return value and takes a two arguments: the data task and the error describing the network or parsing error that occurred.
+
+ @see -dataTaskWithRequest:completionHandler:
+ */
+- (NSURLSessionDataTask *)PATCH:(NSString *)URLString
+                     parameters:(id)parameters
+                        success:(void (^)(NSURLSessionDataTask *task, id responseObject))success
+                        failure:(void (^)(NSURLSessionDataTask *task, NSError *error))failure;
+
+/**
+ Creates and runs an `NSURLSessionDataTask` with a `DELETE` request.
+
+ @param URLString The URL string used to create the request URL.
+ @param parameters The parameters to be encoded according to the client request serializer.
+ @param success A block object to be executed when the task finishes successfully. This block has no return value and takes two arguments: the data task, and the response object created by the client response serializer.
+ @param failure A block object to be executed when the task finishes unsuccessfully, or that finishes successfully, but encountered an error while parsing the response data. This block has no return value and takes a two arguments: the data task and the error describing the network or parsing error that occurred.
+
+ @see -dataTaskWithRequest:completionHandler:
+ */
+- (NSURLSessionDataTask *)DELETE:(NSString *)URLString
+                      parameters:(id)parameters
+                         success:(void (^)(NSURLSessionDataTask *task, id responseObject))success
+                         failure:(void (^)(NSURLSessionDataTask *task, NSError *error))failure;
+
+@end
+
+#endif
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPSessionManager.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPSessionManager.m
new file mode 100644
index 000000000..6413297d7
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPSessionManager.m
@@ -0,0 +1,321 @@
+// AFHTTPSessionManager.m
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import "AFHTTPSessionManager.h"
+
+#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000) || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090)
+
+#import "AFURLRequestSerialization.h"
+#import "AFURLResponseSerialization.h"
+
+#import <Availability.h>
+#import <Security/Security.h>
+
+#ifdef _SYSTEMCONFIGURATION_H
+#import <netinet/in.h>
+#import <netinet6/in6.h>
+#import <arpa/inet.h>
+#import <ifaddrs.h>
+#import <netdb.h>
+#endif
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+#import <UIKit/UIKit.h>
+#endif
+
+@interface AFHTTPSessionManager ()
+@property (readwrite, nonatomic, strong) NSURL *baseURL;
+@end
+
+@implementation AFHTTPSessionManager
+
++ (instancetype)manager {
+    return [[[self class] alloc] initWithBaseURL:nil];
+}
+
+- (instancetype)init {
+    return [self initWithBaseURL:nil];
+}
+
+- (instancetype)initWithBaseURL:(NSURL *)url {
+    return [self initWithBaseURL:url sessionConfiguration:nil];
+}
+
+- (instancetype)initWithSessionConfiguration:(NSURLSessionConfiguration *)configuration {
+    return [self initWithBaseURL:nil sessionConfiguration:configuration];
+}
+
+- (instancetype)initWithBaseURL:(NSURL *)url
+           sessionConfiguration:(NSURLSessionConfiguration *)configuration
+{
+    self = [super initWithSessionConfiguration:configuration];
+    if (!self) {
+        return nil;
+    }
+
+    // Ensure terminal slash for baseURL path, so that NSURL +URLWithString:relativeToURL: works as expected
+    if ([[url path] length] > 0 && ![[url absoluteString] hasSuffix:@"/"]) {
+        url = [url URLByAppendingPathComponent:@""];
+    }
+
+    self.baseURL = url;
+
+    self.requestSerializer = [AFHTTPRequestSerializer serializer];
+    self.responseSerializer = [AFJSONResponseSerializer serializer];
+
+    return self;
+}
+
+#pragma mark -
+
+#ifdef _SYSTEMCONFIGURATION_H
+#endif
+
+- (void)setRequestSerializer:(AFHTTPRequestSerializer <AFURLRequestSerialization> *)requestSerializer {
+    NSParameterAssert(requestSerializer);
+
+    _requestSerializer = requestSerializer;
+}
+
+- (void)setResponseSerializer:(AFHTTPResponseSerializer <AFURLResponseSerialization> *)responseSerializer {
+    NSParameterAssert(responseSerializer);
+
+    [super setResponseSerializer:responseSerializer];
+}
+
+#pragma mark -
+
+- (NSURLSessionDataTask *)GET:(NSString *)URLString
+                   parameters:(id)parameters
+                      success:(void (^)(NSURLSessionDataTask *task, id responseObject))success
+                      failure:(void (^)(NSURLSessionDataTask *task, NSError *error))failure
+{
+    NSURLSessionDataTask *dataTask = [self dataTaskWithHTTPMethod:@"GET" URLString:URLString parameters:parameters success:success failure:failure];
+
+    [dataTask resume];
+
+    return dataTask;
+}
+
+- (NSURLSessionDataTask *)HEAD:(NSString *)URLString
+                    parameters:(id)parameters
+                       success:(void (^)(NSURLSessionDataTask *task))success
+                       failure:(void (^)(NSURLSessionDataTask *task, NSError *error))failure
+{
+    NSURLSessionDataTask *dataTask = [self dataTaskWithHTTPMethod:@"HEAD" URLString:URLString parameters:parameters success:^(NSURLSessionDataTask *task, __unused id responseObject) {
+        if (success) {
+            success(task);
+        }
+    } failure:failure];
+
+    [dataTask resume];
+
+    return dataTask;
+}
+
+- (NSURLSessionDataTask *)POST:(NSString *)URLString
+                    parameters:(id)parameters
+                       success:(void (^)(NSURLSessionDataTask *task, id responseObject))success
+                       failure:(void (^)(NSURLSessionDataTask *task, NSError *error))failure
+{
+    NSURLSessionDataTask *dataTask = [self dataTaskWithHTTPMethod:@"POST" URLString:URLString parameters:parameters success:success failure:failure];
+
+    [dataTask resume];
+
+    return dataTask;
+}
+
+- (NSURLSessionDataTask *)POST:(NSString *)URLString
+                    parameters:(id)parameters
+     constructingBodyWithBlock:(void (^)(id <AFMultipartFormData> formData))block
+                       success:(void (^)(NSURLSessionDataTask *task, id responseObject))success
+                       failure:(void (^)(NSURLSessionDataTask *task, NSError *error))failure
+{
+    NSError *serializationError = nil;
+    NSMutableURLRequest *request = [self.requestSerializer multipartFormRequestWithMethod:@"POST" URLString:[[NSURL URLWithString:URLString relativeToURL:self.baseURL] absoluteString] parameters:parameters constructingBodyWithBlock:block error:&serializationError];
+    if (serializationError) {
+        if (failure) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu"
+            dispatch_async(self.completionQueue ?: dispatch_get_main_queue(), ^{
+                failure(nil, serializationError);
+            });
+#pragma clang diagnostic pop
+        }
+
+        return nil;
+    }
+
+    __block NSURLSessionDataTask *task = [self uploadTaskWithStreamedRequest:request progress:nil completionHandler:^(NSURLResponse * __unused response, id responseObject, NSError *error) {
+        if (error) {
+            if (failure) {
+                failure(task, error);
+            }
+        } else {
+            if (success) {
+                success(task, responseObject);
+            }
+        }
+    }];
+
+    [task resume];
+
+    return task;
+}
+
+- (NSURLSessionDataTask *)PUT:(NSString *)URLString
+                   parameters:(id)parameters
+                      success:(void (^)(NSURLSessionDataTask *task, id responseObject))success
+                      failure:(void (^)(NSURLSessionDataTask *task, NSError *error))failure
+{
+    NSURLSessionDataTask *dataTask = [self dataTaskWithHTTPMethod:@"PUT" URLString:URLString parameters:parameters success:success failure:failure];
+
+    [dataTask resume];
+
+    return dataTask;
+}
+
+- (NSURLSessionDataTask *)PATCH:(NSString *)URLString
+                     parameters:(id)parameters
+                        success:(void (^)(NSURLSessionDataTask *task, id responseObject))success
+                        failure:(void (^)(NSURLSessionDataTask *task, NSError *error))failure
+{
+    NSURLSessionDataTask *dataTask = [self dataTaskWithHTTPMethod:@"PATCH" URLString:URLString parameters:parameters success:success failure:failure];
+
+    [dataTask resume];
+
+    return dataTask;
+}
+
+- (NSURLSessionDataTask *)DELETE:(NSString *)URLString
+                      parameters:(id)parameters
+                         success:(void (^)(NSURLSessionDataTask *task, id responseObject))success
+                         failure:(void (^)(NSURLSessionDataTask *task, NSError *error))failure
+{
+    NSURLSessionDataTask *dataTask = [self dataTaskWithHTTPMethod:@"DELETE" URLString:URLString parameters:parameters success:success failure:failure];
+
+    [dataTask resume];
+
+    return dataTask;
+}
+
+- (NSURLSessionDataTask *)dataTaskWithHTTPMethod:(NSString *)method
+                                       URLString:(NSString *)URLString
+                                      parameters:(id)parameters
+                                         success:(void (^)(NSURLSessionDataTask *, id))success
+                                         failure:(void (^)(NSURLSessionDataTask *, NSError *))failure
+{
+    NSError *serializationError = nil;
+    NSMutableURLRequest *request = [self.requestSerializer requestWithMethod:method URLString:[[NSURL URLWithString:URLString relativeToURL:self.baseURL] absoluteString] parameters:parameters error:&serializationError];
+    if (serializationError) {
+        if (failure) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu"
+            dispatch_async(self.completionQueue ?: dispatch_get_main_queue(), ^{
+                failure(nil, serializationError);
+            });
+#pragma clang diagnostic pop
+        }
+
+        return nil;
+    }
+
+    __block NSURLSessionDataTask *dataTask = nil;
+    dataTask = [self dataTaskWithRequest:request completionHandler:^(NSURLResponse * __unused response, id responseObject, NSError *error) {
+        if (error) {
+            if (failure) {
+                failure(dataTask, error);
+            }
+        } else {
+            if (success) {
+                success(dataTask, responseObject);
+            }
+        }
+    }];
+
+    return dataTask;
+}
+
+#pragma mark - NSObject
+
+- (NSString *)description {
+    return [NSString stringWithFormat:@"<%@: %p, baseURL: %@, session: %@, operationQueue: %@>", NSStringFromClass([self class]), self, [self.baseURL absoluteString], self.session, self.operationQueue];
+}
+
+#pragma mark - NSSecureCoding
+
++ (BOOL)supportsSecureCoding {
+    return YES;
+}
+
+- (id)initWithCoder:(NSCoder *)decoder {
+    NSURL *baseURL = [decoder decodeObjectOfClass:[NSURL class] forKey:NSStringFromSelector(@selector(baseURL))];
+    NSURLSessionConfiguration *configuration = [decoder decodeObjectOfClass:[NSURLSessionConfiguration class] forKey:@"sessionConfiguration"];
+    if (!configuration) {
+        NSString *configurationIdentifier = [decoder decodeObjectOfClass:[NSString class] forKey:@"identifier"];
+        if (configurationIdentifier) {
+#if (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1100)
+            configuration = [NSURLSessionConfiguration backgroundSessionConfigurationWithIdentifier:configurationIdentifier];
+#else
+            configuration = [NSURLSessionConfiguration backgroundSessionConfiguration:configurationIdentifier];
+#endif
+        }
+    }
+
+    self = [self initWithBaseURL:baseURL sessionConfiguration:configuration];
+    if (!self) {
+        return nil;
+    }
+
+    self.requestSerializer = [decoder decodeObjectOfClass:[AFHTTPRequestSerializer class] forKey:NSStringFromSelector(@selector(requestSerializer))];
+    self.responseSerializer = [decoder decodeObjectOfClass:[AFHTTPResponseSerializer class] forKey:NSStringFromSelector(@selector(responseSerializer))];
+
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+    [super encodeWithCoder:coder];
+
+    [coder encodeObject:self.baseURL forKey:NSStringFromSelector(@selector(baseURL))];
+    if ([self.session.configuration conformsToProtocol:@protocol(NSCoding)]) {
+        [coder encodeObject:self.session.configuration forKey:@"sessionConfiguration"];
+    } else {
+        [coder encodeObject:self.session.configuration.identifier forKey:@"identifier"];
+    }
+    [coder encodeObject:self.requestSerializer forKey:NSStringFromSelector(@selector(requestSerializer))];
+    [coder encodeObject:self.responseSerializer forKey:NSStringFromSelector(@selector(responseSerializer))];
+}
+
+#pragma mark - NSCopying
+
+- (id)copyWithZone:(NSZone *)zone {
+    AFHTTPSessionManager *HTTPClient = [[[self class] allocWithZone:zone] initWithBaseURL:self.baseURL sessionConfiguration:self.session.configuration];
+
+    HTTPClient.requestSerializer = [self.requestSerializer copyWithZone:zone];
+    HTTPClient.responseSerializer = [self.responseSerializer copyWithZone:zone];
+    
+    return HTTPClient;
+}
+
+@end
+
+#endif
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFNetworkReachabilityManager.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFNetworkReachabilityManager.h
new file mode 100644
index 000000000..5e610d887
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFNetworkReachabilityManager.h
@@ -0,0 +1,193 @@
+// AFNetworkReachabilityManager.h
+// 
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import <Foundation/Foundation.h>
+#import <SystemConfiguration/SystemConfiguration.h>
+
+typedef NS_ENUM(NSInteger, AFNetworkReachabilityStatus) {
+    AFNetworkReachabilityStatusUnknown          = -1,
+    AFNetworkReachabilityStatusNotReachable     = 0,
+    AFNetworkReachabilityStatusReachableViaWWAN = 1,
+    AFNetworkReachabilityStatusReachableViaWiFi = 2,
+};
+
+/**
+ `AFNetworkReachabilityManager` monitors the reachability of domains, and addresses for both WWAN and WiFi network interfaces.
+ 
+ Reachability can be used to determine background information about why a network operation failed, or to trigger a network operation retrying when a connection is established. It should not be used to prevent a user from initiating a network request, as it's possible that an initial request may be required to establish reachability.
+
+ See Apple's Reachability Sample Code (https://developer.apple.com/library/ios/samplecode/reachability/)
+ 
+ @warning Instances of `AFNetworkReachabilityManager` must be started with `-startMonitoring` before reachability status can be determined.
+ */
+@interface AFNetworkReachabilityManager : NSObject
+
+/**
+ The current network reachability status.
+ */
+@property (readonly, nonatomic, assign) AFNetworkReachabilityStatus networkReachabilityStatus;
+
+/**
+ Whether or not the network is currently reachable.
+ */
+@property (readonly, nonatomic, assign, getter = isReachable) BOOL reachable;
+
+/**
+ Whether or not the network is currently reachable via WWAN.
+ */
+@property (readonly, nonatomic, assign, getter = isReachableViaWWAN) BOOL reachableViaWWAN;
+
+/**
+ Whether or not the network is currently reachable via WiFi.
+ */
+@property (readonly, nonatomic, assign, getter = isReachableViaWiFi) BOOL reachableViaWiFi;
+
+///---------------------
+/// @name Initialization
+///---------------------
+
+/**
+ Returns the shared network reachability manager.
+ */
++ (instancetype)sharedManager;
+
+/**
+ Creates and returns a network reachability manager for the specified domain.
+ 
+ @param domain The domain used to evaluate network reachability.
+ 
+ @return An initialized network reachability manager, actively monitoring the specified domain.
+ */
++ (instancetype)managerForDomain:(NSString *)domain;
+
+/**
+ Creates and returns a network reachability manager for the socket address.
+
+ @param address The socket address (`sockaddr_in`) used to evaluate network reachability.
+
+ @return An initialized network reachability manager, actively monitoring the specified socket address.
+ */
++ (instancetype)managerForAddress:(const void *)address;
+
+/**
+ Initializes an instance of a network reachability manager from the specified reachability object.
+ 
+ @param reachability The reachability object to monitor.
+ 
+ @return An initialized network reachability manager, actively monitoring the specified reachability.
+ */
+- (instancetype)initWithReachability:(SCNetworkReachabilityRef)reachability;
+
+///--------------------------------------------------
+/// @name Starting & Stopping Reachability Monitoring
+///--------------------------------------------------
+
+/**
+ Starts monitoring for changes in network reachability status.
+ */
+- (void)startMonitoring;
+
+/**
+ Stops monitoring for changes in network reachability status.
+ */
+- (void)stopMonitoring;
+
+///-------------------------------------------------
+/// @name Getting Localized Reachability Description
+///-------------------------------------------------
+
+/**
+ Returns a localized string representation of the current network reachability status.
+ */
+- (NSString *)localizedNetworkReachabilityStatusString;
+
+///---------------------------------------------------
+/// @name Setting Network Reachability Change Callback
+///---------------------------------------------------
+
+/**
+ Sets a callback to be executed when the network availability of the `baseURL` host changes.
+
+ @param block A block object to be executed when the network availability of the `baseURL` host changes.. This block has no return value and takes a single argument which represents the various reachability states from the device to the `baseURL`.
+ */
+- (void)setReachabilityStatusChangeBlock:(void (^)(AFNetworkReachabilityStatus status))block;
+
+@end
+
+///----------------
+/// @name Constants
+///----------------
+
+/**
+ ## Network Reachability
+
+ The following constants are provided by `AFNetworkReachabilityManager` as possible network reachability statuses.
+
+ enum {
+ AFNetworkReachabilityStatusUnknown,
+ AFNetworkReachabilityStatusNotReachable,
+ AFNetworkReachabilityStatusReachableViaWWAN,
+ AFNetworkReachabilityStatusReachableViaWiFi,
+ }
+
+ `AFNetworkReachabilityStatusUnknown`
+ The `baseURL` host reachability is not known.
+
+ `AFNetworkReachabilityStatusNotReachable`
+ The `baseURL` host cannot be reached.
+
+ `AFNetworkReachabilityStatusReachableViaWWAN`
+ The `baseURL` host can be reached via a cellular connection, such as EDGE or GPRS.
+
+ `AFNetworkReachabilityStatusReachableViaWiFi`
+ The `baseURL` host can be reached via a Wi-Fi connection.
+
+ ### Keys for Notification UserInfo Dictionary
+
+ Strings that are used as keys in a `userInfo` dictionary in a network reachability status change notification.
+
+ `AFNetworkingReachabilityNotificationStatusItem`
+ A key in the userInfo dictionary in a `AFNetworkingReachabilityDidChangeNotification` notification.
+ The corresponding value is an `NSNumber` object representing the `AFNetworkReachabilityStatus` value for the current reachability status.
+ */
+
+///--------------------
+/// @name Notifications
+///--------------------
+
+/**
+ Posted when network reachability changes.
+ This notification assigns no notification object. The `userInfo` dictionary contains an `NSNumber` object under the `AFNetworkingReachabilityNotificationStatusItem` key, representing the `AFNetworkReachabilityStatus` value for the current network reachability.
+
+ @warning In order for network reachability to be monitored, include the `SystemConfiguration` framework in the active target's "Link Binary With Library" build phase, and add `#import <SystemConfiguration/SystemConfiguration.h>` to the header prefix of the project (`Prefix.pch`).
+ */
+extern NSString * const AFNetworkingReachabilityDidChangeNotification;
+extern NSString * const AFNetworkingReachabilityNotificationStatusItem;
+
+///--------------------
+/// @name Functions
+///--------------------
+
+/**
+ Returns a localized string representation of an `AFNetworkReachabilityStatus` value.
+ */
+extern NSString * AFStringFromNetworkReachabilityStatus(AFNetworkReachabilityStatus status);
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFNetworkReachabilityManager.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFNetworkReachabilityManager.m
new file mode 100644
index 000000000..1da148282
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFNetworkReachabilityManager.m
@@ -0,0 +1,259 @@
+// AFNetworkReachabilityManager.m
+// 
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import "AFNetworkReachabilityManager.h"
+
+#import <netinet/in.h>
+#import <netinet6/in6.h>
+#import <arpa/inet.h>
+#import <ifaddrs.h>
+#import <netdb.h>
+
+NSString * const AFNetworkingReachabilityDidChangeNotification = @"com.alamofire.networking.reachability.change";
+NSString * const AFNetworkingReachabilityNotificationStatusItem = @"AFNetworkingReachabilityNotificationStatusItem";
+
+typedef void (^AFNetworkReachabilityStatusBlock)(AFNetworkReachabilityStatus status);
+
+typedef NS_ENUM(NSUInteger, AFNetworkReachabilityAssociation) {
+    AFNetworkReachabilityForAddress = 1,
+    AFNetworkReachabilityForAddressPair = 2,
+    AFNetworkReachabilityForName = 3,
+};
+
+NSString * AFStringFromNetworkReachabilityStatus(AFNetworkReachabilityStatus status) {
+    switch (status) {
+        case AFNetworkReachabilityStatusNotReachable:
+            return NSLocalizedStringFromTable(@"Not Reachable", @"AFNetworking", nil);
+        case AFNetworkReachabilityStatusReachableViaWWAN:
+            return NSLocalizedStringFromTable(@"Reachable via WWAN", @"AFNetworking", nil);
+        case AFNetworkReachabilityStatusReachableViaWiFi:
+            return NSLocalizedStringFromTable(@"Reachable via WiFi", @"AFNetworking", nil);
+        case AFNetworkReachabilityStatusUnknown:
+        default:
+            return NSLocalizedStringFromTable(@"Unknown", @"AFNetworking", nil);
+    }
+}
+
+static AFNetworkReachabilityStatus AFNetworkReachabilityStatusForFlags(SCNetworkReachabilityFlags flags) {
+    BOOL isReachable = ((flags & kSCNetworkReachabilityFlagsReachable) != 0);
+    BOOL needsConnection = ((flags & kSCNetworkReachabilityFlagsConnectionRequired) != 0);
+    BOOL canConnectionAutomatically = (((flags & kSCNetworkReachabilityFlagsConnectionOnDemand ) != 0) || ((flags & kSCNetworkReachabilityFlagsConnectionOnTraffic) != 0));
+    BOOL canConnectWithoutUserInteraction = (canConnectionAutomatically && (flags & kSCNetworkReachabilityFlagsInterventionRequired) == 0);
+    BOOL isNetworkReachable = (isReachable && (!needsConnection || canConnectWithoutUserInteraction));
+
+    AFNetworkReachabilityStatus status = AFNetworkReachabilityStatusUnknown;
+    if (isNetworkReachable == NO) {
+        status = AFNetworkReachabilityStatusNotReachable;
+    }
+#if	TARGET_OS_IPHONE
+    else if ((flags & kSCNetworkReachabilityFlagsIsWWAN) != 0) {
+        status = AFNetworkReachabilityStatusReachableViaWWAN;
+    }
+#endif
+    else {
+        status = AFNetworkReachabilityStatusReachableViaWiFi;
+    }
+
+    return status;
+}
+
+static void AFNetworkReachabilityCallback(SCNetworkReachabilityRef __unused target, SCNetworkReachabilityFlags flags, void *info) {
+    AFNetworkReachabilityStatus status = AFNetworkReachabilityStatusForFlags(flags);
+    AFNetworkReachabilityStatusBlock block = (__bridge AFNetworkReachabilityStatusBlock)info;
+    if (block) {
+        block(status);
+    }
+
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+        NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
+        [notificationCenter postNotificationName:AFNetworkingReachabilityDidChangeNotification object:nil userInfo:@{ AFNetworkingReachabilityNotificationStatusItem: @(status) }];
+    });
+    
+}
+
+static const void * AFNetworkReachabilityRetainCallback(const void *info) {
+    return Block_copy(info);
+}
+
+static void AFNetworkReachabilityReleaseCallback(const void *info) {
+    if (info) {
+        Block_release(info);
+    }
+}
+
+@interface AFNetworkReachabilityManager ()
+@property (readwrite, nonatomic, assign) SCNetworkReachabilityRef networkReachability;
+@property (readwrite, nonatomic, assign) AFNetworkReachabilityAssociation networkReachabilityAssociation;
+@property (readwrite, nonatomic, assign) AFNetworkReachabilityStatus networkReachabilityStatus;
+@property (readwrite, nonatomic, copy) AFNetworkReachabilityStatusBlock networkReachabilityStatusBlock;
+@end
+
+@implementation AFNetworkReachabilityManager
+
++ (instancetype)sharedManager {
+    static AFNetworkReachabilityManager *_sharedManager = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        struct sockaddr_in address;
+        bzero(&address, sizeof(address));
+        address.sin_len = sizeof(address);
+        address.sin_family = AF_INET;
+
+        _sharedManager = [self managerForAddress:&address];
+    });
+
+    return _sharedManager;
+}
+
++ (instancetype)managerForDomain:(NSString *)domain {
+    SCNetworkReachabilityRef reachability = SCNetworkReachabilityCreateWithName(kCFAllocatorDefault, [domain UTF8String]);
+
+    AFNetworkReachabilityManager *manager = [[self alloc] initWithReachability:reachability];
+    manager.networkReachabilityAssociation = AFNetworkReachabilityForName;
+
+    return manager;
+}
+
++ (instancetype)managerForAddress:(const void *)address {
+    SCNetworkReachabilityRef reachability = SCNetworkReachabilityCreateWithAddress(kCFAllocatorDefault, (const struct sockaddr *)address);
+
+    AFNetworkReachabilityManager *manager = [[self alloc] initWithReachability:reachability];
+    manager.networkReachabilityAssociation = AFNetworkReachabilityForAddress;
+
+    return manager;
+}
+
+- (instancetype)initWithReachability:(SCNetworkReachabilityRef)reachability {
+    self = [super init];
+    if (!self) {
+        return nil;
+    }
+
+    self.networkReachability = reachability;
+    self.networkReachabilityStatus = AFNetworkReachabilityStatusUnknown;
+
+    return self;
+}
+
+- (void)dealloc {
+    [self stopMonitoring];
+
+    if (_networkReachability) {
+        CFRelease(_networkReachability);
+        _networkReachability = NULL;
+    }
+}
+
+#pragma mark -
+
+- (BOOL)isReachable {
+    return [self isReachableViaWWAN] || [self isReachableViaWiFi];
+}
+
+- (BOOL)isReachableViaWWAN {
+    return self.networkReachabilityStatus == AFNetworkReachabilityStatusReachableViaWWAN;
+}
+
+- (BOOL)isReachableViaWiFi {
+    return self.networkReachabilityStatus == AFNetworkReachabilityStatusReachableViaWiFi;
+}
+
+#pragma mark -
+
+- (void)startMonitoring {
+    [self stopMonitoring];
+
+    if (!self.networkReachability) {
+        return;
+    }
+
+    __weak __typeof(self)weakSelf = self;
+    AFNetworkReachabilityStatusBlock callback = ^(AFNetworkReachabilityStatus status) {
+        __strong __typeof(weakSelf)strongSelf = weakSelf;
+
+        strongSelf.networkReachabilityStatus = status;
+        if (strongSelf.networkReachabilityStatusBlock) {
+            strongSelf.networkReachabilityStatusBlock(status);
+        }
+
+    };
+
+    SCNetworkReachabilityContext context = {0, (__bridge void *)callback, AFNetworkReachabilityRetainCallback, AFNetworkReachabilityReleaseCallback, NULL};
+    SCNetworkReachabilitySetCallback(self.networkReachability, AFNetworkReachabilityCallback, &context);
+    SCNetworkReachabilityScheduleWithRunLoop(self.networkReachability, CFRunLoopGetMain(), kCFRunLoopCommonModes);
+
+    switch (self.networkReachabilityAssociation) {
+        case AFNetworkReachabilityForName:
+            break;
+        case AFNetworkReachabilityForAddress:
+        case AFNetworkReachabilityForAddressPair:
+        default: {
+            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0),^{
+                SCNetworkReachabilityFlags flags;
+                SCNetworkReachabilityGetFlags(self.networkReachability, &flags);
+                AFNetworkReachabilityStatus status = AFNetworkReachabilityStatusForFlags(flags);
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    callback(status);
+                    
+                    NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
+                    [notificationCenter postNotificationName:AFNetworkingReachabilityDidChangeNotification object:nil userInfo:@{ AFNetworkingReachabilityNotificationStatusItem: @(status) }];
+
+                    
+                });
+            });
+        }
+            break;
+    }
+}
+
+- (void)stopMonitoring {
+    if (!self.networkReachability) {
+        return;
+    }
+
+    SCNetworkReachabilityUnscheduleFromRunLoop(self.networkReachability, CFRunLoopGetMain(), kCFRunLoopCommonModes);
+}
+
+#pragma mark -
+
+- (NSString *)localizedNetworkReachabilityStatusString {
+    return AFStringFromNetworkReachabilityStatus(self.networkReachabilityStatus);
+}
+
+#pragma mark -
+
+- (void)setReachabilityStatusChangeBlock:(void (^)(AFNetworkReachabilityStatus status))block {
+    self.networkReachabilityStatusBlock = block;
+}
+
+#pragma mark - NSKeyValueObserving
+
++ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
+    if ([key isEqualToString:@"reachable"] || [key isEqualToString:@"reachableViaWWAN"] || [key isEqualToString:@"reachableViaWiFi"]) {
+        return [NSSet setWithObject:@"networkReachabilityStatus"];
+    }
+
+    return [super keyPathsForValuesAffectingValueForKey:key];
+}
+
+@end
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFNetworking.h
new file mode 100644
index 000000000..68273da58
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFNetworking.h
@@ -0,0 +1,44 @@
+// AFNetworking.h
+//
+// Copyright (c) 2013 AFNetworking (http://afnetworking.com/)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import <Foundation/Foundation.h>
+#import <Availability.h>
+
+#ifndef _AFNETWORKING_
+    #define _AFNETWORKING_
+
+    #import "AFURLRequestSerialization.h"
+    #import "AFURLResponseSerialization.h"
+    #import "AFSecurityPolicy.h"
+    #import "AFNetworkReachabilityManager.h"
+
+    #import "AFURLConnectionOperation.h"
+    #import "AFHTTPRequestOperation.h"
+    #import "AFHTTPRequestOperationManager.h"
+
+#if ( ( defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090) || \
+      ( defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000 ) )
+    #import "AFURLSessionManager.h"
+    #import "AFHTTPSessionManager.h"
+#endif
+
+#endif /* _AFNETWORKING_ */
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFSecurityPolicy.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFSecurityPolicy.h
new file mode 100644
index 000000000..a880d7519
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFSecurityPolicy.h
@@ -0,0 +1,143 @@
+// AFSecurity.h
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import <Foundation/Foundation.h>
+#import <Security/Security.h>
+
+typedef NS_ENUM(NSUInteger, AFSSLPinningMode) {
+    AFSSLPinningModeNone,
+    AFSSLPinningModePublicKey,
+    AFSSLPinningModeCertificate,
+};
+
+/**
+ `AFSecurityPolicy` evaluates server trust against pinned X.509 certificates and public keys over secure connections.
+ 
+ Adding pinned SSL certificates to your app helps prevent man-in-the-middle attacks and other vulnerabilities. Applications dealing with sensitive customer data or financial information are strongly encouraged to route all communication over an HTTPS connection with SSL pinning configured and enabled.
+ */
+@interface AFSecurityPolicy : NSObject
+
+/**
+ The criteria by which server trust should be evaluated against the pinned SSL certificates. Defaults to `AFSSLPinningModeNone`.
+ */
+@property (readonly, nonatomic, assign) AFSSLPinningMode SSLPinningMode;
+
+/**
+ Whether to evaluate an entire SSL certificate chain, or just the leaf certificate. Defaults to `YES`.
+ */
+@property (nonatomic, assign) BOOL validatesCertificateChain;
+
+/**
+ The certificates used to evaluate server trust according to the SSL pinning mode. By default, this property is set to any (`.cer`) certificates included in the app bundle.
+ */
+@property (nonatomic, strong) NSArray *pinnedCertificates;
+
+/**
+ Whether or not to trust servers with an invalid or expired SSL certificates. Defaults to `NO`.
+ */
+@property (nonatomic, assign) BOOL allowInvalidCertificates;
+
+/**
+ Whether or not to validate the domain name in the certificate's CN field. Defaults to `YES` for `AFSSLPinningModePublicKey` or `AFSSLPinningModeCertificate`, otherwise `NO`.
+ */
+@property (nonatomic, assign) BOOL validatesDomainName;
+
+///-----------------------------------------
+/// @name Getting Specific Security Policies
+///-----------------------------------------
+
+/**
+ Returns the shared default security policy, which does not allow invalid certificates, does not validate domain name, and does not validate against pinned certificates or public keys.
+ 
+ @return The default security policy.
+ */
++ (instancetype)defaultPolicy;
+
+///---------------------
+/// @name Initialization
+///---------------------
+
+/**
+ Creates and returns a security policy with the specified pinning mode.
+
+ @param pinningMode The SSL pinning mode.
+ 
+ @return A new security policy.
+ */
++ (instancetype)policyWithPinningMode:(AFSSLPinningMode)pinningMode;
+
+///------------------------------
+/// @name Evaluating Server Trust
+///------------------------------
+
+/**
+ Whether or not the specified server trust should be accepted, based on the security policy.
+
+ This method should be used when responding to an authentication challenge from a server.
+
+ @param serverTrust The X.509 certificate trust of the server.
+
+ @return Whether or not to trust the server.
+ 
+ @warning This method has been deprecated in favor of `-evaluateServerTrust:forDomain:`.
+ */
+- (BOOL)evaluateServerTrust:(SecTrustRef)serverTrust DEPRECATED_ATTRIBUTE;
+
+/**
+ Whether or not the specified server trust should be accepted, based on the security policy. 
+ 
+ This method should be used when responding to an authentication challenge from a server.
+ 
+ @param serverTrust The X.509 certificate trust of the server.
+ @param domain The domain of serverTrust. If `nil`, the domain will not be validated.
+ 
+ @return Whether or not to trust the server.
+ */
+- (BOOL)evaluateServerTrust:(SecTrustRef)serverTrust
+                  forDomain:(NSString *)domain;
+
+@end
+
+///----------------
+/// @name Constants
+///----------------
+
+/**
+ ## SSL Pinning Modes
+
+ The following constants are provided by `AFSSLPinningMode` as possible SSL pinning modes.
+
+ enum {
+ AFSSLPinningModeNone,
+ AFSSLPinningModePublicKey,
+ AFSSLPinningModeCertificate,
+ }
+
+ `AFSSLPinningModeNone`
+ Do not used pinned certificates to validate servers.
+
+ `AFSSLPinningModePublicKey`
+ Validate host certificates against public keys of pinned certificates.
+
+ `AFSSLPinningModeCertificate`
+ Validate host certificates against pinned certificates.
+*/
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFSecurityPolicy.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFSecurityPolicy.m
new file mode 100644
index 000000000..1f97f914f
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFSecurityPolicy.m
@@ -0,0 +1,335 @@
+// AFSecurity.m
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import "AFSecurityPolicy.h"
+
+// Equivalent of macro in <AssertMacros.h>, without causing compiler warning:
+// "'DebugAssert' is deprecated: first deprecated in OS X 10.8"
+#ifndef AF_Require
+    #define AF_Require(assertion, exceptionLabel)                \
+        do {                                                     \
+            if (__builtin_expect(!(assertion), 0)) {             \
+                goto exceptionLabel;                             \
+            }                                                    \
+        } while (0)
+#endif
+
+#ifndef AF_Require_noErr
+    #define AF_Require_noErr(errorCode, exceptionLabel)          \
+        do {                                                     \
+            if (__builtin_expect(0 != (errorCode), 0)) {         \
+                goto exceptionLabel;                             \
+            }                                                    \
+        } while (0)
+#endif
+
+#if !defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+static NSData * AFSecKeyGetData(SecKeyRef key) {
+    CFDataRef data = NULL;
+
+    AF_Require_noErr(SecItemExport(key, kSecFormatUnknown, kSecItemPemArmour, NULL, &data), _out);
+
+    return (__bridge_transfer NSData *)data;
+
+_out:
+    if (data) {
+        CFRelease(data);
+    }
+
+    return nil;
+}
+#endif
+
+static BOOL AFSecKeyIsEqualToKey(SecKeyRef key1, SecKeyRef key2) {
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+    return [(__bridge id)key1 isEqual:(__bridge id)key2];
+#else
+    return [AFSecKeyGetData(key1) isEqual:AFSecKeyGetData(key2)];
+#endif
+}
+
+static id AFPublicKeyForCertificate(NSData *certificate) {
+    id allowedPublicKey = nil;
+    SecCertificateRef allowedCertificate;
+    SecCertificateRef allowedCertificates[1];
+    CFArrayRef tempCertificates = nil;
+    SecPolicyRef policy = nil;
+    SecTrustRef allowedTrust = nil;
+    SecTrustResultType result;
+
+    allowedCertificate = SecCertificateCreateWithData(NULL, (__bridge CFDataRef)certificate);
+    AF_Require(allowedCertificate != NULL, _out);
+
+    allowedCertificates[0] = allowedCertificate;
+    tempCertificates = CFArrayCreate(NULL, (const void **)allowedCertificates, 1, NULL);
+
+    policy = SecPolicyCreateBasicX509();
+    AF_Require_noErr(SecTrustCreateWithCertificates(tempCertificates, policy, &allowedTrust), _out);
+    AF_Require_noErr(SecTrustEvaluate(allowedTrust, &result), _out);
+
+    allowedPublicKey = (__bridge_transfer id)SecTrustCopyPublicKey(allowedTrust);
+
+_out:
+    if (allowedTrust) {
+        CFRelease(allowedTrust);
+    }
+
+    if (policy) {
+        CFRelease(policy);
+    }
+
+    if (tempCertificates) {
+        CFRelease(tempCertificates);
+    }
+
+    if (allowedCertificate) {
+        CFRelease(allowedCertificate);
+    }
+
+    return allowedPublicKey;
+}
+
+static BOOL AFServerTrustIsValid(SecTrustRef serverTrust) {
+    BOOL isValid = NO;
+    SecTrustResultType result;
+    AF_Require_noErr(SecTrustEvaluate(serverTrust, &result), _out);
+
+    isValid = (result == kSecTrustResultUnspecified || result == kSecTrustResultProceed);
+
+_out:
+    return isValid;
+}
+
+static NSArray * AFCertificateTrustChainForServerTrust(SecTrustRef serverTrust) {
+    CFIndex certificateCount = SecTrustGetCertificateCount(serverTrust);
+    NSMutableArray *trustChain = [NSMutableArray arrayWithCapacity:(NSUInteger)certificateCount];
+
+    for (CFIndex i = 0; i < certificateCount; i++) {
+        SecCertificateRef certificate = SecTrustGetCertificateAtIndex(serverTrust, i);
+        [trustChain addObject:(__bridge_transfer NSData *)SecCertificateCopyData(certificate)];
+    }
+
+    return [NSArray arrayWithArray:trustChain];
+}
+
+static NSArray * AFPublicKeyTrustChainForServerTrust(SecTrustRef serverTrust) {
+    SecPolicyRef policy = SecPolicyCreateBasicX509();
+    CFIndex certificateCount = SecTrustGetCertificateCount(serverTrust);
+    NSMutableArray *trustChain = [NSMutableArray arrayWithCapacity:(NSUInteger)certificateCount];
+    for (CFIndex i = 0; i < certificateCount; i++) {
+        SecCertificateRef certificate = SecTrustGetCertificateAtIndex(serverTrust, i);
+
+        SecCertificateRef someCertificates[] = {certificate};
+        CFArrayRef certificates = CFArrayCreate(NULL, (const void **)someCertificates, 1, NULL);
+
+        SecTrustRef trust;
+        AF_Require_noErr(SecTrustCreateWithCertificates(certificates, policy, &trust), _out);
+        
+        SecTrustResultType result;
+        AF_Require_noErr(SecTrustEvaluate(trust, &result), _out);
+
+        [trustChain addObject:(__bridge_transfer id)SecTrustCopyPublicKey(trust)];
+
+    _out:
+        if (trust) {
+            CFRelease(trust);
+        }
+
+        if (certificates) {
+            CFRelease(certificates);
+        }
+
+        continue;
+    }
+    CFRelease(policy);
+
+    return [NSArray arrayWithArray:trustChain];
+}
+
+#pragma mark -
+
+@interface AFSecurityPolicy()
+@property (readwrite, nonatomic, assign) AFSSLPinningMode SSLPinningMode;
+@property (readwrite, nonatomic, strong) NSArray *pinnedPublicKeys;
+@end
+
+@implementation AFSecurityPolicy
+
++ (NSArray *)defaultPinnedCertificates {
+    static NSArray *_defaultPinnedCertificates = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        NSBundle *bundle = [NSBundle bundleForClass:[self class]];
+        NSArray *paths = [bundle pathsForResourcesOfType:@"cer" inDirectory:@"."];
+
+        NSMutableArray *certificates = [NSMutableArray arrayWithCapacity:[paths count]];
+        for (NSString *path in paths) {
+            NSData *certificateData = [NSData dataWithContentsOfFile:path];
+            [certificates addObject:certificateData];
+        }
+
+        _defaultPinnedCertificates = [[NSArray alloc] initWithArray:certificates];
+    });
+
+    return _defaultPinnedCertificates;
+}
+
++ (instancetype)defaultPolicy {
+    AFSecurityPolicy *securityPolicy = [[self alloc] init];
+    securityPolicy.SSLPinningMode = AFSSLPinningModeNone;
+
+    return securityPolicy;
+}
+
++ (instancetype)policyWithPinningMode:(AFSSLPinningMode)pinningMode {
+    AFSecurityPolicy *securityPolicy = [[self alloc] init];
+    securityPolicy.SSLPinningMode = pinningMode;
+
+    [securityPolicy setPinnedCertificates:[self defaultPinnedCertificates]];
+
+    return securityPolicy;
+}
+
+- (id)init {
+    self = [super init];
+    if (!self) {
+        return nil;
+    }
+
+    self.validatesCertificateChain = YES;
+
+    return self;
+}
+
+#pragma mark -
+
+- (void)setSSLPinningMode:(AFSSLPinningMode)SSLPinningMode {
+    _SSLPinningMode = SSLPinningMode;
+
+    switch (self.SSLPinningMode) {
+        case AFSSLPinningModePublicKey:
+        case AFSSLPinningModeCertificate:
+            self.validatesDomainName = YES;
+            break;
+        default:
+            self.validatesDomainName = NO;
+            break;
+    }
+}
+
+- (void)setPinnedCertificates:(NSArray *)pinnedCertificates {
+    _pinnedCertificates = pinnedCertificates;
+
+    if (self.pinnedCertificates) {
+        NSMutableArray *mutablePinnedPublicKeys = [NSMutableArray arrayWithCapacity:[self.pinnedCertificates count]];
+        for (NSData *certificate in self.pinnedCertificates) {
+            id publicKey = AFPublicKeyForCertificate(certificate);
+            if (!publicKey) {
+                continue;
+            }
+            [mutablePinnedPublicKeys addObject:publicKey];
+        }
+        self.pinnedPublicKeys = [NSArray arrayWithArray:mutablePinnedPublicKeys];
+    } else {
+        self.pinnedPublicKeys = nil;
+    }
+}
+
+#pragma mark -
+
+- (BOOL)evaluateServerTrust:(SecTrustRef)serverTrust {
+    return [self evaluateServerTrust:serverTrust forDomain:nil];
+}
+
+- (BOOL)evaluateServerTrust:(SecTrustRef)serverTrust
+                  forDomain:(NSString *)domain
+{
+    NSMutableArray *policies = [NSMutableArray array];
+    if (self.validatesDomainName) {
+        [policies addObject:(__bridge_transfer id)SecPolicyCreateSSL(true, (__bridge CFStringRef)domain)];
+    } else {
+        [policies addObject:(__bridge_transfer id)SecPolicyCreateBasicX509()];
+    }
+
+    SecTrustSetPolicies(serverTrust, (__bridge CFArrayRef)policies);
+
+    if (!AFServerTrustIsValid(serverTrust) && !self.allowInvalidCertificates) {
+        return NO;
+    }
+
+    NSArray *serverCertificates = AFCertificateTrustChainForServerTrust(serverTrust);
+    switch (self.SSLPinningMode) {
+        case AFSSLPinningModeNone:
+            return YES;
+        case AFSSLPinningModeCertificate: {
+            NSMutableArray *pinnedCertificates = [NSMutableArray array];
+            for (NSData *certificateData in self.pinnedCertificates) {
+                [pinnedCertificates addObject:(__bridge_transfer id)SecCertificateCreateWithData(NULL, (__bridge CFDataRef)certificateData)];
+            }
+            SecTrustSetAnchorCertificates(serverTrust, (__bridge CFArrayRef)pinnedCertificates);
+
+            if (!AFServerTrustIsValid(serverTrust)) {
+                return NO;
+            }
+
+            if (!self.validatesCertificateChain) {
+                return YES;
+            }
+
+            NSUInteger trustedCertificateCount = 0;
+            for (NSData *trustChainCertificate in serverCertificates) {
+                if ([self.pinnedCertificates containsObject:trustChainCertificate]) {
+                    trustedCertificateCount++;
+                }
+            }
+
+            return trustedCertificateCount == [serverCertificates count];
+        }
+        case AFSSLPinningModePublicKey: {
+            NSUInteger trustedPublicKeyCount = 0;
+            NSArray *publicKeys = AFPublicKeyTrustChainForServerTrust(serverTrust);
+            if (!self.validatesCertificateChain && [publicKeys count] > 0) {
+                publicKeys = @[[publicKeys firstObject]];
+            }
+
+            for (id trustChainPublicKey in publicKeys) {
+                for (id pinnedPublicKey in self.pinnedPublicKeys) {
+                    if (AFSecKeyIsEqualToKey((__bridge SecKeyRef)trustChainPublicKey, (__bridge SecKeyRef)pinnedPublicKey)) {
+                        trustedPublicKeyCount += 1;
+                    }
+                }
+            }
+
+            return trustedPublicKeyCount > 0 && ((self.validatesCertificateChain && trustedPublicKeyCount == [serverCertificates count]) || (!self.validatesCertificateChain && trustedPublicKeyCount >= 1));
+        }
+    }
+    
+    return NO;
+}
+
+#pragma mark - NSKeyValueObserving
+
++ (NSSet *)keyPathsForValuesAffectingPinnedPublicKeys {
+    return [NSSet setWithObject:@"pinnedCertificates"];
+}
+
+@end
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLConnectionOperation.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLConnectionOperation.h
new file mode 100644
index 000000000..85435564c
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLConnectionOperation.h
@@ -0,0 +1,328 @@
+// AFURLConnectionOperation.h
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import <Foundation/Foundation.h>
+
+#import <Availability.h>
+#import "AFURLRequestSerialization.h"
+#import "AFURLResponseSerialization.h"
+#import "AFSecurityPolicy.h"
+
+/**
+ `AFURLConnectionOperation` is a subclass of `NSOperation` that implements `NSURLConnection` delegate methods.
+
+ ## Subclassing Notes
+
+ This is the base class of all network request operations. You may wish to create your own subclass in order to implement additional `NSURLConnection` delegate methods (see "`NSURLConnection` Delegate Methods" below), or to provide additional properties and/or class constructors.
+
+ If you are creating a subclass that communicates over the HTTP or HTTPS protocols, you may want to consider subclassing `AFHTTPRequestOperation` instead, as it supports specifying acceptable content types or status codes.
+
+ ## NSURLConnection Delegate Methods
+
+ `AFURLConnectionOperation` implements the following `NSURLConnection` delegate methods:
+
+ - `connection:didReceiveResponse:`
+ - `connection:didReceiveData:`
+ - `connectionDidFinishLoading:`
+ - `connection:didFailWithError:`
+ - `connection:didSendBodyData:totalBytesWritten:totalBytesExpectedToWrite:`
+ - `connection:willCacheResponse:`
+ - `connectionShouldUseCredentialStorage:`
+ - `connection:needNewBodyStream:` 
+ - `connection:willSendRequestForAuthenticationChallenge:`
+
+ If any of these methods are overridden in a subclass, they _must_ call the `super` implementation first.
+
+ ## Callbacks and Completion Blocks
+
+ The built-in `completionBlock` provided by `NSOperation` allows for custom behavior to be executed after the request finishes. It is a common pattern for class constructors in subclasses to take callback block parameters, and execute them conditionally in the body of its `completionBlock`. Make sure to handle cancelled operations appropriately when setting a `completionBlock` (i.e. returning early before parsing response data). See the implementation of any of the `AFHTTPRequestOperation` subclasses for an example of this.
+
+ Subclasses are strongly discouraged from overriding `setCompletionBlock:`, as `AFURLConnectionOperation`'s implementation includes a workaround to mitigate retain cycles, and what Apple rather ominously refers to as ["The Deallocation Problem"](http://developer.apple.com/library/ios/#technotes/tn2109/).
+ 
+ ## SSL Pinning
+ 
+ Relying on the CA trust model to validate SSL certificates exposes your app to security vulnerabilities, such as man-in-the-middle attacks. For applications that connect to known servers, SSL certificate pinning provides an increased level of security, by checking server certificate validity against those specified in the app bundle.
+ 
+ SSL with certificate pinning is strongly recommended for any application that transmits sensitive information to an external webservice.
+
+ Connections will be validated on all matching certificates with a `.cer` extension in the bundle root.
+ 
+ ## App Extensions
+ 
+ When using AFNetworking in an App Extension, `#define AF_APP_EXTENSIONS` to avoid using unavailable APIs.
+
+ ## NSCoding & NSCopying Conformance
+
+ `AFURLConnectionOperation` conforms to the `NSCoding` and `NSCopying` protocols, allowing operations to be archived to disk, and copied in memory, respectively. However, because of the intrinsic limitations of capturing the exact state of an operation at a particular moment, there are some important caveats to keep in mind:
+
+ ### NSCoding Caveats
+
+ - Encoded operations do not include any block or stream properties. Be sure to set `completionBlock`, `outputStream`, and any callback blocks as necessary when using `-initWithCoder:` or `NSKeyedUnarchiver`.
+ - Operations are paused on `encodeWithCoder:`. If the operation was encoded while paused or still executing, its archived state will return `YES` for `isReady`. Otherwise, the state of an operation when encoding will remain unchanged.
+
+ ### NSCopying Caveats
+
+ - `-copy` and `-copyWithZone:` return a new operation with the `NSURLRequest` of the original. So rather than an exact copy of the operation at that particular instant, the copying mechanism returns a completely new instance, which can be useful for retrying operations.
+ - A copy of an operation will not include the `outputStream` of the original.
+ - Operation copies do not include `completionBlock`, as it often strongly captures a reference to `self`, which would otherwise have the unintuitive side-effect of pointing to the _original_ operation when copied.
+ */
+
+@interface AFURLConnectionOperation : NSOperation <NSURLConnectionDelegate, NSURLConnectionDataDelegate, NSSecureCoding, NSCopying>
+
+///-------------------------------
+/// @name Accessing Run Loop Modes
+///-------------------------------
+
+/**
+ The run loop modes in which the operation will run on the network thread. By default, this is a single-member set containing `NSRunLoopCommonModes`.
+ */
+@property (nonatomic, strong) NSSet *runLoopModes;
+
+///-----------------------------------------
+/// @name Getting URL Connection Information
+///-----------------------------------------
+
+/**
+ The request used by the operation's connection.
+ */
+@property (readonly, nonatomic, strong) NSURLRequest *request;
+
+/**
+ The last response received by the operation's connection.
+ */
+@property (readonly, nonatomic, strong) NSURLResponse *response;
+
+/**
+ The error, if any, that occurred in the lifecycle of the request.
+ */
+@property (readonly, nonatomic, strong) NSError *error;
+
+///----------------------------
+/// @name Getting Response Data
+///----------------------------
+
+/**
+ The data received during the request.
+ */
+@property (readonly, nonatomic, strong) NSData *responseData;
+
+/**
+ The string representation of the response data.
+ */
+@property (readonly, nonatomic, copy) NSString *responseString;
+
+/**
+ The string encoding of the response.
+
+ If the response does not specify a valid string encoding, `responseStringEncoding` will return `NSUTF8StringEncoding`.
+ */
+@property (readonly, nonatomic, assign) NSStringEncoding responseStringEncoding;
+
+///-------------------------------
+/// @name Managing URL Credentials
+///-------------------------------
+
+/**
+ Whether the URL connection should consult the credential storage for authenticating the connection. `YES` by default.
+
+ This is the value that is returned in the `NSURLConnectionDelegate` method `-connectionShouldUseCredentialStorage:`.
+ */
+@property (nonatomic, assign) BOOL shouldUseCredentialStorage;
+
+/**
+ The credential used for authentication challenges in `-connection:didReceiveAuthenticationChallenge:`.
+
+ This will be overridden by any shared credentials that exist for the username or password of the request URL, if present.
+ */
+@property (nonatomic, strong) NSURLCredential *credential;
+
+///-------------------------------
+/// @name Managing Security Policy
+///-------------------------------
+
+/**
+ The security policy used to evaluate server trust for secure connections.
+ */
+@property (nonatomic, strong) AFSecurityPolicy *securityPolicy;
+
+///------------------------
+/// @name Accessing Streams
+///------------------------
+
+/**
+ The input stream used to read data to be sent during the request.
+
+ This property acts as a proxy to the `HTTPBodyStream` property of `request`.
+ */
+@property (nonatomic, strong) NSInputStream *inputStream;
+
+/**
+ The output stream that is used to write data received until the request is finished.
+
+ By default, data is accumulated into a buffer that is stored into `responseData` upon completion of the request, with the intermediary `outputStream` property set to `nil`. When `outputStream` is set, the data will not be accumulated into an internal buffer, and as a result, the `responseData` property of the completed request will be `nil`. The output stream will be scheduled in the network thread runloop upon being set.
+ */
+@property (nonatomic, strong) NSOutputStream *outputStream;
+
+///---------------------------------
+/// @name Managing Callback Queues
+///---------------------------------
+
+/**
+ The dispatch queue for `completionBlock`. If `NULL` (default), the main queue is used.
+ */
+@property (nonatomic, strong) dispatch_queue_t completionQueue;
+
+/**
+ The dispatch group for `completionBlock`. If `NULL` (default), a private dispatch group is used.
+ */
+@property (nonatomic, strong) dispatch_group_t completionGroup;
+
+///---------------------------------------------
+/// @name Managing Request Operation Information
+///---------------------------------------------
+
+/**
+ The user info dictionary for the receiver.
+ */
+@property (nonatomic, strong) NSDictionary *userInfo;
+
+///------------------------------------------------------
+/// @name Initializing an AFURLConnectionOperation Object
+///------------------------------------------------------
+
+/**
+ Initializes and returns a newly allocated operation object with a url connection configured with the specified url request.
+ 
+ This is the designated initializer.
+ 
+ @param urlRequest The request object to be used by the operation connection.
+ */
+- (instancetype)initWithRequest:(NSURLRequest *)urlRequest;
+
+///----------------------------------
+/// @name Pausing / Resuming Requests
+///----------------------------------
+
+/**
+ Pauses the execution of the request operation.
+
+ A paused operation returns `NO` for `-isReady`, `-isExecuting`, and `-isFinished`. As such, it will remain in an `NSOperationQueue` until it is either cancelled or resumed. Pausing a finished, cancelled, or paused operation has no effect.
+ */
+- (void)pause;
+
+/**
+ Whether the request operation is currently paused.
+
+ @return `YES` if the operation is currently paused, otherwise `NO`.
+ */
+- (BOOL)isPaused;
+
+/**
+ Resumes the execution of the paused request operation.
+
+ Pause/Resume behavior varies depending on the underlying implementation for the operation class. In its base implementation, resuming a paused requests restarts the original request. However, since HTTP defines a specification for how to request a specific content range, `AFHTTPRequestOperation` will resume downloading the request from where it left off, instead of restarting the original request.
+ */
+- (void)resume;
+
+///----------------------------------------------
+/// @name Configuring Backgrounding Task Behavior
+///----------------------------------------------
+
+/**
+ Specifies that the operation should continue execution after the app has entered the background, and the expiration handler for that background task.
+
+ @param handler A handler to be called shortly before the application’s remaining background time reaches 0. The handler is wrapped in a block that cancels the operation, and cleans up and marks the end of execution, unlike the `handler` parameter in `UIApplication -beginBackgroundTaskWithExpirationHandler:`, which expects this to be done in the handler itself. The handler is called synchronously on the main thread, thus blocking the application’s suspension momentarily while the application is notified.
+  */
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && !defined(AF_APP_EXTENSIONS)
+- (void)setShouldExecuteAsBackgroundTaskWithExpirationHandler:(void (^)(void))handler;
+#endif
+
+///---------------------------------
+/// @name Setting Progress Callbacks
+///---------------------------------
+
+/**
+ Sets a callback to be called when an undetermined number of bytes have been uploaded to the server.
+
+ @param block A block object to be called when an undetermined number of bytes have been uploaded to the server. This block has no return value and takes three arguments: the number of bytes written since the last time the upload progress block was called, the total bytes written, and the total bytes expected to be written during the request, as initially determined by the length of the HTTP body. This block may be called multiple times, and will execute on the main thread.
+ */
+- (void)setUploadProgressBlock:(void (^)(NSUInteger bytesWritten, long long totalBytesWritten, long long totalBytesExpectedToWrite))block;
+
+/**
+ Sets a callback to be called when an undetermined number of bytes have been downloaded from the server.
+
+ @param block A block object to be called when an undetermined number of bytes have been downloaded from the server. This block has no return value and takes three arguments: the number of bytes read since the last time the download progress block was called, the total bytes read, and the total bytes expected to be read during the request, as initially determined by the expected content size of the `NSHTTPURLResponse` object. This block may be called multiple times, and will execute on the main thread.
+ */
+- (void)setDownloadProgressBlock:(void (^)(NSUInteger bytesRead, long long totalBytesRead, long long totalBytesExpectedToRead))block;
+
+///-------------------------------------------------
+/// @name Setting NSURLConnection Delegate Callbacks
+///-------------------------------------------------
+
+/**
+ Sets a block to be executed when the connection will authenticate a challenge in order to download its request, as handled by the `NSURLConnectionDelegate` method `connection:willSendRequestForAuthenticationChallenge:`.
+ 
+ @param block A block object to be executed when the connection will authenticate a challenge in order to download its request. The block has no return type and takes two arguments: the URL connection object, and the challenge that must be authenticated. This block must invoke one of the challenge-responder methods (NSURLAuthenticationChallengeSender protocol).
+ 
+ If `allowsInvalidSSLCertificate` is set to YES, `connection:willSendRequestForAuthenticationChallenge:` will attempt to have the challenge sender use credentials with invalid SSL certificates.
+ */
+- (void)setWillSendRequestForAuthenticationChallengeBlock:(void (^)(NSURLConnection *connection, NSURLAuthenticationChallenge *challenge))block;
+
+/**
+ Sets a block to be executed when the server redirects the request from one URL to another URL, or when the request URL changed by the `NSURLProtocol` subclass handling the request in order to standardize its format, as handled by the `NSURLConnectionDataDelegate` method `connection:willSendRequest:redirectResponse:`.
+
+ @param block A block object to be executed when the request URL was changed. The block returns an `NSURLRequest` object, the URL request to redirect, and takes three arguments: the URL connection object, the the proposed redirected request, and the URL response that caused the redirect.
+ */
+- (void)setRedirectResponseBlock:(NSURLRequest * (^)(NSURLConnection *connection, NSURLRequest *request, NSURLResponse *redirectResponse))block;
+
+
+/**
+ Sets a block to be executed to modify the response a connection will cache, if any, as handled by the `NSURLConnectionDelegate` method `connection:willCacheResponse:`.
+
+ @param block A block object to be executed to determine what response a connection will cache, if any. The block returns an `NSCachedURLResponse` object, the cached response to store in memory or `nil` to prevent the response from being cached, and takes two arguments: the URL connection object, and the cached response provided for the request.
+ */
+- (void)setCacheResponseBlock:(NSCachedURLResponse * (^)(NSURLConnection *connection, NSCachedURLResponse *cachedResponse))block;
+
+///
+
+/**
+
+ */
++ (NSArray *)batchOfRequestOperations:(NSArray *)operations
+                        progressBlock:(void (^)(NSUInteger numberOfFinishedOperations, NSUInteger totalNumberOfOperations))progressBlock
+                      completionBlock:(void (^)(NSArray *operations))completionBlock;
+
+@end
+
+///--------------------
+/// @name Notifications
+///--------------------
+
+/**
+ Posted when an operation begins executing.
+ */
+extern NSString * const AFNetworkingOperationDidStartNotification;
+
+/**
+ Posted when an operation finishes.
+ */
+extern NSString * const AFNetworkingOperationDidFinishNotification;
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLConnectionOperation.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLConnectionOperation.m
new file mode 100644
index 000000000..cfe609a2d
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLConnectionOperation.m
@@ -0,0 +1,789 @@
+// AFURLConnectionOperation.m
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import "AFURLConnectionOperation.h"
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+#import <UIKit/UIKit.h>
+#endif
+
+#if !__has_feature(objc_arc)
+#error AFNetworking must be built with ARC.
+// You can turn on ARC for only AFNetworking files by adding -fobjc-arc to the build phase for each of its files.
+#endif
+
+typedef NS_ENUM(NSInteger, AFOperationState) {
+    AFOperationPausedState      = -1,
+    AFOperationReadyState       = 1,
+    AFOperationExecutingState   = 2,
+    AFOperationFinishedState    = 3,
+};
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && !defined(AF_APP_EXTENSIONS)
+typedef UIBackgroundTaskIdentifier AFBackgroundTaskIdentifier;
+#else
+typedef id AFBackgroundTaskIdentifier;
+#endif
+
+static dispatch_group_t url_request_operation_completion_group() {
+    static dispatch_group_t af_url_request_operation_completion_group;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        af_url_request_operation_completion_group = dispatch_group_create();
+    });
+
+    return af_url_request_operation_completion_group;
+}
+
+static dispatch_queue_t url_request_operation_completion_queue() {
+    static dispatch_queue_t af_url_request_operation_completion_queue;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        af_url_request_operation_completion_queue = dispatch_queue_create("com.alamofire.networking.operation.queue", DISPATCH_QUEUE_CONCURRENT );
+    });
+
+    return af_url_request_operation_completion_queue;
+}
+
+static NSString * const kAFNetworkingLockName = @"com.alamofire.networking.operation.lock";
+
+NSString * const AFNetworkingOperationDidStartNotification = @"com.alamofire.networking.operation.start";
+NSString * const AFNetworkingOperationDidFinishNotification = @"com.alamofire.networking.operation.finish";
+
+typedef void (^AFURLConnectionOperationProgressBlock)(NSUInteger bytes, long long totalBytes, long long totalBytesExpected);
+typedef void (^AFURLConnectionOperationAuthenticationChallengeBlock)(NSURLConnection *connection, NSURLAuthenticationChallenge *challenge);
+typedef NSCachedURLResponse * (^AFURLConnectionOperationCacheResponseBlock)(NSURLConnection *connection, NSCachedURLResponse *cachedResponse);
+typedef NSURLRequest * (^AFURLConnectionOperationRedirectResponseBlock)(NSURLConnection *connection, NSURLRequest *request, NSURLResponse *redirectResponse);
+
+static inline NSString * AFKeyPathFromOperationState(AFOperationState state) {
+    switch (state) {
+        case AFOperationReadyState:
+            return @"isReady";
+        case AFOperationExecutingState:
+            return @"isExecuting";
+        case AFOperationFinishedState:
+            return @"isFinished";
+        case AFOperationPausedState:
+            return @"isPaused";
+        default: {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunreachable-code"
+            return @"state";
+#pragma clang diagnostic pop
+        }
+    }
+}
+
+static inline BOOL AFStateTransitionIsValid(AFOperationState fromState, AFOperationState toState, BOOL isCancelled) {
+    switch (fromState) {
+        case AFOperationReadyState:
+            switch (toState) {
+                case AFOperationPausedState:
+                case AFOperationExecutingState:
+                    return YES;
+                case AFOperationFinishedState:
+                    return isCancelled;
+                default:
+                    return NO;
+            }
+        case AFOperationExecutingState:
+            switch (toState) {
+                case AFOperationPausedState:
+                case AFOperationFinishedState:
+                    return YES;
+                default:
+                    return NO;
+            }
+        case AFOperationFinishedState:
+            return NO;
+        case AFOperationPausedState:
+            return toState == AFOperationReadyState;
+        default: {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunreachable-code"
+            switch (toState) {
+                case AFOperationPausedState:
+                case AFOperationReadyState:
+                case AFOperationExecutingState:
+                case AFOperationFinishedState:
+                    return YES;
+                default:
+                    return NO;
+            }
+        }
+#pragma clang diagnostic pop
+    }
+}
+
+@interface AFURLConnectionOperation ()
+@property (readwrite, nonatomic, assign) AFOperationState state;
+@property (readwrite, nonatomic, strong) NSRecursiveLock *lock;
+@property (readwrite, nonatomic, strong) NSURLConnection *connection;
+@property (readwrite, nonatomic, strong) NSURLRequest *request;
+@property (readwrite, nonatomic, strong) NSURLResponse *response;
+@property (readwrite, nonatomic, strong) NSError *error;
+@property (readwrite, nonatomic, strong) NSData *responseData;
+@property (readwrite, nonatomic, copy) NSString *responseString;
+@property (readwrite, nonatomic, assign) NSStringEncoding responseStringEncoding;
+@property (readwrite, nonatomic, assign) long long totalBytesRead;
+@property (readwrite, nonatomic, assign) AFBackgroundTaskIdentifier backgroundTaskIdentifier;
+@property (readwrite, nonatomic, copy) AFURLConnectionOperationProgressBlock uploadProgress;
+@property (readwrite, nonatomic, copy) AFURLConnectionOperationProgressBlock downloadProgress;
+@property (readwrite, nonatomic, copy) AFURLConnectionOperationAuthenticationChallengeBlock authenticationChallenge;
+@property (readwrite, nonatomic, copy) AFURLConnectionOperationCacheResponseBlock cacheResponse;
+@property (readwrite, nonatomic, copy) AFURLConnectionOperationRedirectResponseBlock redirectResponse;
+
+- (void)operationDidStart;
+- (void)finish;
+- (void)cancelConnection;
+@end
+
+@implementation AFURLConnectionOperation
+@synthesize outputStream = _outputStream;
+
++ (void)networkRequestThreadEntryPoint:(id)__unused object {
+    @autoreleasepool {
+        [[NSThread currentThread] setName:@"AFNetworking"];
+
+        NSRunLoop *runLoop = [NSRunLoop currentRunLoop];
+        [runLoop addPort:[NSMachPort port] forMode:NSDefaultRunLoopMode];
+        [runLoop run];
+    }
+}
+
++ (NSThread *)networkRequestThread {
+    static NSThread *_networkRequestThread = nil;
+    static dispatch_once_t oncePredicate;
+    dispatch_once(&oncePredicate, ^{
+        _networkRequestThread = [[NSThread alloc] initWithTarget:self selector:@selector(networkRequestThreadEntryPoint:) object:nil];
+        [_networkRequestThread start];
+    });
+    
+    return _networkRequestThread;
+}
+
+- (instancetype)initWithRequest:(NSURLRequest *)urlRequest {
+    NSParameterAssert(urlRequest);
+
+    self = [super init];
+    if (!self) {
+		return nil;
+    }
+
+    _state = AFOperationReadyState;
+
+    self.lock = [[NSRecursiveLock alloc] init];
+    self.lock.name = kAFNetworkingLockName;
+    
+    self.runLoopModes = [NSSet setWithObject:NSRunLoopCommonModes];
+    
+    self.request = urlRequest;
+    
+    self.shouldUseCredentialStorage = YES;
+
+    self.securityPolicy = [AFSecurityPolicy defaultPolicy];
+
+    return self;
+}
+
+- (void)dealloc {
+    if (_outputStream) {
+        [_outputStream close];
+        _outputStream = nil;
+    }
+    
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && !defined(AF_APP_EXTENSIONS)
+    if (_backgroundTaskIdentifier) {
+        [[UIApplication sharedApplication] endBackgroundTask:_backgroundTaskIdentifier];
+        _backgroundTaskIdentifier = UIBackgroundTaskInvalid;
+    }
+#endif
+}
+
+#pragma mark -
+
+- (void)setResponseData:(NSData *)responseData {
+    [self.lock lock];
+    if (!responseData) {
+        _responseData = nil;
+    } else {
+        _responseData = [NSData dataWithBytes:responseData.bytes length:responseData.length];
+    }
+    [self.lock unlock];
+}
+
+- (NSString *)responseString {
+    [self.lock lock];
+    if (!_responseString && self.response && self.responseData) {
+        self.responseString = [[NSString alloc] initWithData:self.responseData encoding:self.responseStringEncoding];
+    }
+    [self.lock unlock];
+
+    return _responseString;
+}
+
+- (NSStringEncoding)responseStringEncoding {
+    [self.lock lock];
+    if (!_responseStringEncoding && self.response) {
+        NSStringEncoding stringEncoding = NSUTF8StringEncoding;
+        if (self.response.textEncodingName) {
+            CFStringEncoding IANAEncoding = CFStringConvertIANACharSetNameToEncoding((__bridge CFStringRef)self.response.textEncodingName);
+            if (IANAEncoding != kCFStringEncodingInvalidId) {
+                stringEncoding = CFStringConvertEncodingToNSStringEncoding(IANAEncoding);
+            }
+        }
+
+        self.responseStringEncoding = stringEncoding;
+    }
+    [self.lock unlock];
+
+    return _responseStringEncoding;
+}
+
+- (NSInputStream *)inputStream {
+    return self.request.HTTPBodyStream;
+}
+
+- (void)setInputStream:(NSInputStream *)inputStream {
+    NSMutableURLRequest *mutableRequest = [self.request mutableCopy];
+    mutableRequest.HTTPBodyStream = inputStream;
+    self.request = mutableRequest;
+}
+
+- (NSOutputStream *)outputStream {
+    if (!_outputStream) {
+        self.outputStream = [NSOutputStream outputStreamToMemory];
+    }
+
+    return _outputStream;
+}
+
+- (void)setOutputStream:(NSOutputStream *)outputStream {
+    [self.lock lock];
+    if (outputStream != _outputStream) {
+        if (_outputStream) {
+            [_outputStream close];
+        }
+
+        _outputStream = outputStream;
+    }
+    [self.lock unlock];
+}
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && !defined(AF_APP_EXTENSIONS)
+- (void)setShouldExecuteAsBackgroundTaskWithExpirationHandler:(void (^)(void))handler {
+    [self.lock lock];
+    if (!self.backgroundTaskIdentifier) {
+        UIApplication *application = [UIApplication sharedApplication];
+        __weak __typeof(self)weakSelf = self;
+        self.backgroundTaskIdentifier = [application beginBackgroundTaskWithExpirationHandler:^{
+            __strong __typeof(weakSelf)strongSelf = weakSelf;
+            
+            if (handler) {
+                handler();
+            }
+            
+            if (strongSelf) {
+                [strongSelf cancel];
+                
+                [application endBackgroundTask:strongSelf.backgroundTaskIdentifier];
+                strongSelf.backgroundTaskIdentifier = UIBackgroundTaskInvalid;
+            }
+        }];
+    }
+    [self.lock unlock];
+}
+#endif
+
+#pragma mark -
+
+- (void)setState:(AFOperationState)state {
+    if (!AFStateTransitionIsValid(self.state, state, [self isCancelled])) {
+        return;
+    }
+    
+    [self.lock lock];
+    NSString *oldStateKey = AFKeyPathFromOperationState(self.state);
+    NSString *newStateKey = AFKeyPathFromOperationState(state);
+    
+    [self willChangeValueForKey:newStateKey];
+    [self willChangeValueForKey:oldStateKey];
+    _state = state;
+    [self didChangeValueForKey:oldStateKey];
+    [self didChangeValueForKey:newStateKey];
+    [self.lock unlock];
+}
+
+- (void)pause {
+    if ([self isPaused] || [self isFinished] || [self isCancelled]) {
+        return;
+    }
+    
+    [self.lock lock];
+    if ([self isExecuting]) {
+        [self performSelector:@selector(operationDidPause) onThread:[[self class] networkRequestThread] withObject:nil waitUntilDone:NO modes:[self.runLoopModes allObjects]];
+        
+        dispatch_async(dispatch_get_main_queue(), ^{
+            NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
+            [notificationCenter postNotificationName:AFNetworkingOperationDidFinishNotification object:self];
+        });
+    }
+    
+    self.state = AFOperationPausedState;
+    [self.lock unlock];
+}
+
+- (void)operationDidPause {
+    [self.lock lock];
+    [self.connection cancel];
+    [self.lock unlock];
+}
+
+- (BOOL)isPaused {
+    return self.state == AFOperationPausedState;
+}
+
+- (void)resume {
+    if (![self isPaused]) {
+        return;
+    }
+    
+    [self.lock lock];
+    self.state = AFOperationReadyState;
+    
+    [self start];
+    [self.lock unlock];
+}
+
+#pragma mark -
+
+- (void)setUploadProgressBlock:(void (^)(NSUInteger bytesWritten, long long totalBytesWritten, long long totalBytesExpectedToWrite))block {
+    self.uploadProgress = block;
+}
+
+- (void)setDownloadProgressBlock:(void (^)(NSUInteger bytesRead, long long totalBytesRead, long long totalBytesExpectedToRead))block {
+    self.downloadProgress = block;
+}
+
+- (void)setWillSendRequestForAuthenticationChallengeBlock:(void (^)(NSURLConnection *connection, NSURLAuthenticationChallenge *challenge))block {
+    self.authenticationChallenge = block;
+}
+
+- (void)setCacheResponseBlock:(NSCachedURLResponse * (^)(NSURLConnection *connection, NSCachedURLResponse *cachedResponse))block {
+    self.cacheResponse = block;
+}
+
+- (void)setRedirectResponseBlock:(NSURLRequest * (^)(NSURLConnection *connection, NSURLRequest *request, NSURLResponse *redirectResponse))block {
+    self.redirectResponse = block;
+}
+
+#pragma mark - NSOperation
+
+- (void)setCompletionBlock:(void (^)(void))block {
+    [self.lock lock];
+    if (!block) {
+        [super setCompletionBlock:nil];
+    } else {
+        __weak __typeof(self)weakSelf = self;
+        [super setCompletionBlock:^ {
+            __strong __typeof(weakSelf)strongSelf = weakSelf;
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu"
+            dispatch_group_t group = strongSelf.completionGroup ?: url_request_operation_completion_group();
+            dispatch_queue_t queue = strongSelf.completionQueue ?: dispatch_get_main_queue();
+#pragma clang diagnostic pop
+
+            dispatch_group_async(group, queue, ^{
+                block();
+            });
+
+            dispatch_group_notify(group, url_request_operation_completion_queue(), ^{
+                [strongSelf setCompletionBlock:nil];
+            });
+        }];
+    }
+    [self.lock unlock];
+}
+
+- (BOOL)isReady {
+    return self.state == AFOperationReadyState && [super isReady];
+}
+
+- (BOOL)isExecuting {
+    return self.state == AFOperationExecutingState;
+}
+
+- (BOOL)isFinished {
+    return self.state == AFOperationFinishedState;
+}
+
+- (BOOL)isConcurrent {
+    return YES;
+}
+
+- (void)start {
+    [self.lock lock];
+    if ([self isCancelled]) {
+        [self performSelector:@selector(cancelConnection) onThread:[[self class] networkRequestThread] withObject:nil waitUntilDone:NO modes:[self.runLoopModes allObjects]];
+    } else if ([self isReady]) {
+        self.state = AFOperationExecutingState;
+        
+        [self performSelector:@selector(operationDidStart) onThread:[[self class] networkRequestThread] withObject:nil waitUntilDone:NO modes:[self.runLoopModes allObjects]];
+    }
+    [self.lock unlock];
+}
+
+- (void)operationDidStart {
+    [self.lock lock];
+    if (![self isCancelled]) {
+        self.connection = [[NSURLConnection alloc] initWithRequest:self.request delegate:self startImmediately:NO];
+        
+        NSRunLoop *runLoop = [NSRunLoop currentRunLoop];
+        for (NSString *runLoopMode in self.runLoopModes) {
+            [self.connection scheduleInRunLoop:runLoop forMode:runLoopMode];
+            [self.outputStream scheduleInRunLoop:runLoop forMode:runLoopMode];
+        }
+        
+        [self.outputStream open];
+        [self.connection start];
+    }
+    [self.lock unlock];
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [[NSNotificationCenter defaultCenter] postNotificationName:AFNetworkingOperationDidStartNotification object:self];
+    });
+}
+
+- (void)finish {
+    [self.lock lock];
+    self.state = AFOperationFinishedState;
+    [self.lock unlock];
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [[NSNotificationCenter defaultCenter] postNotificationName:AFNetworkingOperationDidFinishNotification object:self];
+    });
+}
+
+- (void)cancel {
+    [self.lock lock];
+    if (![self isFinished] && ![self isCancelled]) {
+        [super cancel];
+
+        if ([self isExecuting]) {
+            [self performSelector:@selector(cancelConnection) onThread:[[self class] networkRequestThread] withObject:nil waitUntilDone:NO modes:[self.runLoopModes allObjects]];
+        }
+    }
+    [self.lock unlock];
+}
+
+- (void)cancelConnection {
+    NSDictionary *userInfo = nil;
+    if ([self.request URL]) {
+        userInfo = [NSDictionary dictionaryWithObject:[self.request URL] forKey:NSURLErrorFailingURLErrorKey];
+    }
+    NSError *error = [NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorCancelled userInfo:userInfo];
+
+    if (![self isFinished]) {
+        if (self.connection) {
+            [self.connection cancel];
+            [self performSelector:@selector(connection:didFailWithError:) withObject:self.connection withObject:error];
+        } else {
+            // Accomodate race condition where `self.connection` has not yet been set before cancellation
+            self.error = error;
+            [self finish];
+        }
+    }
+}
+
+#pragma mark -
+
++ (NSArray *)batchOfRequestOperations:(NSArray *)operations
+                        progressBlock:(void (^)(NSUInteger numberOfFinishedOperations, NSUInteger totalNumberOfOperations))progressBlock
+                      completionBlock:(void (^)(NSArray *operations))completionBlock
+{
+    if (!operations || [operations count] == 0) {
+        return @[[NSBlockOperation blockOperationWithBlock:^{
+            dispatch_async(dispatch_get_main_queue(), ^{
+                if (completionBlock) {
+                    completionBlock(@[]);
+                }
+            });
+        }]];
+    }
+
+    __block dispatch_group_t group = dispatch_group_create();
+    NSBlockOperation *batchedOperation = [NSBlockOperation blockOperationWithBlock:^{
+        dispatch_group_notify(group, dispatch_get_main_queue(), ^{
+            if (completionBlock) {
+                completionBlock(operations);
+            }
+        });
+    }];
+
+    for (AFURLConnectionOperation *operation in operations) {
+        operation.completionGroup = group;
+        void (^originalCompletionBlock)(void) = [operation.completionBlock copy];
+        __weak __typeof(operation)weakOperation = operation;
+        operation.completionBlock = ^{
+            __strong __typeof(weakOperation)strongOperation = weakOperation;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu"
+            dispatch_queue_t queue = strongOperation.completionQueue ?: dispatch_get_main_queue();
+#pragma clang diagnostic pop
+            dispatch_group_async(group, queue, ^{
+                if (originalCompletionBlock) {
+                    originalCompletionBlock();
+                }
+
+                NSUInteger numberOfFinishedOperations = [[operations indexesOfObjectsPassingTest:^BOOL(id op, NSUInteger __unused idx,  BOOL __unused *stop) {
+                    return [op isFinished];
+                }] count];
+
+                if (progressBlock) {
+                    progressBlock(numberOfFinishedOperations, [operations count]);
+                }
+
+                dispatch_group_leave(group);
+            });
+        };
+
+        dispatch_group_enter(group);
+        [batchedOperation addDependency:operation];
+    }
+
+    return [operations arrayByAddingObject:batchedOperation];
+}
+
+#pragma mark - NSObject
+
+- (NSString *)description {
+    [self.lock lock];
+    NSString *description = [NSString stringWithFormat:@"<%@: %p, state: %@, cancelled: %@ request: %@, response: %@>", NSStringFromClass([self class]), self, AFKeyPathFromOperationState(self.state), ([self isCancelled] ? @"YES" : @"NO"), self.request, self.response];
+    [self.lock unlock];
+    return description;
+}
+
+#pragma mark - NSURLConnectionDelegate
+
+- (void)connection:(NSURLConnection *)connection
+willSendRequestForAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
+{
+    if (self.authenticationChallenge) {
+        self.authenticationChallenge(connection, challenge);
+        return;
+    }
+
+    if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) {
+        if ([self.securityPolicy evaluateServerTrust:challenge.protectionSpace.serverTrust forDomain:challenge.protectionSpace.host]) {
+            NSURLCredential *credential = [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust];
+            [[challenge sender] useCredential:credential forAuthenticationChallenge:challenge];
+        } else {
+            [[challenge sender] cancelAuthenticationChallenge:challenge];
+        }
+    } else {
+        if ([challenge previousFailureCount] == 0) {
+            if (self.credential) {
+                [[challenge sender] useCredential:self.credential forAuthenticationChallenge:challenge];
+            } else {
+                [[challenge sender] continueWithoutCredentialForAuthenticationChallenge:challenge];
+            }
+        } else {
+            [[challenge sender] continueWithoutCredentialForAuthenticationChallenge:challenge];
+        }
+    }
+}
+
+- (BOOL)connectionShouldUseCredentialStorage:(NSURLConnection __unused *)connection {
+    return self.shouldUseCredentialStorage;
+}
+
+- (NSURLRequest *)connection:(NSURLConnection *)connection
+             willSendRequest:(NSURLRequest *)request
+            redirectResponse:(NSURLResponse *)redirectResponse
+{
+    if (self.redirectResponse) {
+        return self.redirectResponse(connection, request, redirectResponse);
+    } else {
+        return request;
+    }
+}
+
+- (void)connection:(NSURLConnection __unused *)connection
+   didSendBodyData:(NSInteger)bytesWritten
+ totalBytesWritten:(NSInteger)totalBytesWritten
+totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite
+{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if (self.uploadProgress) {
+            self.uploadProgress((NSUInteger)bytesWritten, totalBytesWritten, totalBytesExpectedToWrite);
+        }
+    });
+}
+
+- (void)connection:(NSURLConnection __unused *)connection
+didReceiveResponse:(NSURLResponse *)response
+{
+    self.response = response;
+}
+
+- (void)connection:(NSURLConnection __unused *)connection
+    didReceiveData:(NSData *)data
+{
+    NSUInteger length = [data length];
+    while (YES) {
+        NSInteger totalNumberOfBytesWritten = 0;
+        if ([self.outputStream hasSpaceAvailable]) {
+            const uint8_t *dataBuffer = (uint8_t *)[data bytes];
+
+            NSInteger numberOfBytesWritten = 0;
+            while (totalNumberOfBytesWritten < (NSInteger)length) {
+                numberOfBytesWritten = [self.outputStream write:&dataBuffer[(NSUInteger)totalNumberOfBytesWritten] maxLength:(length - (NSUInteger)totalNumberOfBytesWritten)];
+                if (numberOfBytesWritten == -1) {
+                    break;
+                }
+                
+                totalNumberOfBytesWritten += numberOfBytesWritten;
+            }
+
+            break;
+        }
+        
+        if (self.outputStream.streamError) {
+            [self.connection cancel];
+            [self performSelector:@selector(connection:didFailWithError:) withObject:self.connection withObject:self.outputStream.streamError];
+            return;
+        }
+    }
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+        self.totalBytesRead += (long long)length;
+
+        if (self.downloadProgress) {
+            self.downloadProgress(length, self.totalBytesRead, self.response.expectedContentLength);
+        }
+    });
+}
+
+- (void)connectionDidFinishLoading:(NSURLConnection __unused *)connection {
+    self.responseData = [self.outputStream propertyForKey:NSStreamDataWrittenToMemoryStreamKey];
+
+    [self.outputStream close];
+    if (self.responseData) {
+       self.outputStream = nil;
+    }
+
+    self.connection = nil;
+
+    [self finish];
+}
+
+- (void)connection:(NSURLConnection __unused *)connection
+  didFailWithError:(NSError *)error
+{
+    self.error = error;
+
+    [self.outputStream close];
+    if (self.responseData) {
+        self.outputStream = nil;
+    }
+
+    self.connection = nil;
+
+    [self finish];
+}
+
+- (NSCachedURLResponse *)connection:(NSURLConnection *)connection
+                  willCacheResponse:(NSCachedURLResponse *)cachedResponse
+{
+    if (self.cacheResponse) {
+        return self.cacheResponse(connection, cachedResponse);
+    } else {
+        if ([self isCancelled]) {
+            return nil;
+        }
+        
+        return cachedResponse;
+    }
+}
+
+#pragma mark - NSSecureCoding
+
++ (BOOL)supportsSecureCoding {
+    return YES;
+}
+
+- (id)initWithCoder:(NSCoder *)decoder {
+    NSURLRequest *request = [decoder decodeObjectOfClass:[NSURLRequest class] forKey:NSStringFromSelector(@selector(request))];
+    
+    self = [self initWithRequest:request];
+    if (!self) {
+        return nil;
+    }
+
+    self.state = [[decoder decodeObjectOfClass:[NSNumber class] forKey:NSStringFromSelector(@selector(state))] integerValue];
+    self.response = [decoder decodeObjectOfClass:[NSHTTPURLResponse class] forKey:NSStringFromSelector(@selector(response))];
+    self.error = [decoder decodeObjectOfClass:[NSError class] forKey:NSStringFromSelector(@selector(error))];
+    self.responseData = [decoder decodeObjectOfClass:[NSData class] forKey:NSStringFromSelector(@selector(responseData))];
+    self.totalBytesRead = [[decoder decodeObjectOfClass:[NSNumber class] forKey:NSStringFromSelector(@selector(totalBytesRead))] longLongValue];
+
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+    [self pause];
+    
+    [coder encodeObject:self.request forKey:NSStringFromSelector(@selector(request))];
+    
+    switch (self.state) {
+        case AFOperationExecutingState:
+        case AFOperationPausedState:
+            [coder encodeInteger:AFOperationReadyState forKey:NSStringFromSelector(@selector(state))];
+            break;
+        default:
+            [coder encodeInteger:self.state forKey:NSStringFromSelector(@selector(state))];
+            break;
+    }
+    
+    [coder encodeObject:self.response forKey:NSStringFromSelector(@selector(response))];
+    [coder encodeObject:self.error forKey:NSStringFromSelector(@selector(error))];
+    [coder encodeObject:self.responseData forKey:NSStringFromSelector(@selector(responseData))];
+    [coder encodeInt64:self.totalBytesRead forKey:NSStringFromSelector(@selector(totalBytesRead))];
+}
+
+#pragma mark - NSCopying
+
+- (id)copyWithZone:(NSZone *)zone {
+    AFURLConnectionOperation *operation = [(AFURLConnectionOperation *)[[self class] allocWithZone:zone] initWithRequest:self.request];
+    
+    operation.uploadProgress = self.uploadProgress;
+    operation.downloadProgress = self.downloadProgress;
+    operation.authenticationChallenge = self.authenticationChallenge;
+    operation.cacheResponse = self.cacheResponse;
+    operation.redirectResponse = self.redirectResponse;
+    operation.completionQueue = self.completionQueue;
+    operation.completionGroup = self.completionGroup;
+    
+    return operation;
+}
+
+@end
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLRequestSerialization.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLRequestSerialization.h
new file mode 100644
index 000000000..aed454981
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLRequestSerialization.h
@@ -0,0 +1,463 @@
+// AFSerialization.h
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import <Foundation/Foundation.h>
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+#import <UIKit/UIKit.h>
+#endif
+
+/**
+ The `AFURLRequestSerialization` protocol is adopted by an object that encodes parameters for a specified HTTP requests. Request serializers may encode parameters as query strings, HTTP bodies, setting the appropriate HTTP header fields as necessary.
+
+ For example, a JSON request serializer may set the HTTP body of the request to a JSON representation, and set the `Content-Type` HTTP header field value to `application/json`.
+ */
+@protocol AFURLRequestSerialization <NSObject, NSSecureCoding, NSCopying>
+
+/**
+ Returns a request with the specified parameters encoded into a copy of the original request.
+
+ @param request The original request.
+ @param parameters The parameters to be encoded.
+ @param error The error that occurred while attempting to encode the request parameters.
+
+ @return A serialized request.
+ */
+- (NSURLRequest *)requestBySerializingRequest:(NSURLRequest *)request
+                               withParameters:(id)parameters
+                                        error:(NSError * __autoreleasing *)error;
+
+@end
+
+#pragma mark -
+
+/**
+
+ */
+typedef NS_ENUM(NSUInteger, AFHTTPRequestQueryStringSerializationStyle) {
+    AFHTTPRequestQueryStringDefaultStyle = 0,
+};
+
+@protocol AFMultipartFormData;
+
+/**
+ `AFHTTPRequestSerializer` conforms to the `AFURLRequestSerialization` & `AFURLResponseSerialization` protocols, offering a concrete base implementation of query string / URL form-encoded parameter serialization and default request headers, as well as response status code and content type validation.
+
+ Any request or response serializer dealing with HTTP is encouraged to subclass `AFHTTPRequestSerializer` in order to ensure consistent default behavior.
+ */
+@interface AFHTTPRequestSerializer : NSObject <AFURLRequestSerialization>
+
+/**
+ The string encoding used to serialize parameters. `NSUTF8StringEncoding` by default.
+ */
+@property (nonatomic, assign) NSStringEncoding stringEncoding;
+
+/**
+ Whether created requests can use the device’s cellular radio (if present). `YES` by default.
+ 
+ @see NSMutableURLRequest -setAllowsCellularAccess:
+ */
+@property (nonatomic, assign) BOOL allowsCellularAccess;
+
+/**
+ The cache policy of created requests. `NSURLRequestUseProtocolCachePolicy` by default.
+ 
+ @see NSMutableURLRequest -setCachePolicy:
+ */
+@property (nonatomic, assign) NSURLRequestCachePolicy cachePolicy;
+
+/**
+ Whether created requests should use the default cookie handling. `YES` by default.
+ 
+ @see NSMutableURLRequest -setHTTPShouldHandleCookies:
+ */
+@property (nonatomic, assign) BOOL HTTPShouldHandleCookies;
+
+/**
+ Whether created requests can continue transmitting data before receiving a response from an earlier transmission. `NO` by default
+ 
+ @see NSMutableURLRequest -setHTTPShouldUsePipelining:
+ */
+@property (nonatomic, assign) BOOL HTTPShouldUsePipelining;
+
+/**
+ The network service type for created requests. `NSURLNetworkServiceTypeDefault` by default.
+ 
+ @see NSMutableURLRequest -setNetworkServiceType:
+ */
+@property (nonatomic, assign) NSURLRequestNetworkServiceType networkServiceType;
+
+/**
+ The timeout interval, in seconds, for created requests. The default timeout interval is 60 seconds.
+ 
+ @see NSMutableURLRequest -setTimeoutInterval:
+ */
+@property (nonatomic, assign) NSTimeInterval timeoutInterval;
+
+///---------------------------------------
+/// @name Configuring HTTP Request Headers
+///---------------------------------------
+
+/**
+ Default HTTP header field values to be applied to serialized requests.
+ */
+@property (readonly, nonatomic, strong) NSDictionary *HTTPRequestHeaders;
+
+/**
+ Creates and returns a serializer with default configuration.
+ */
++ (instancetype)serializer;
+
+/**
+ Sets the value for the HTTP headers set in request objects made by the HTTP client. If `nil`, removes the existing value for that header.
+
+ @param field The HTTP header to set a default value for
+ @param value The value set as default for the specified header, or `nil`
+ */
+- (void)setValue:(NSString *)value
+forHTTPHeaderField:(NSString *)field;
+
+/**
+ Returns the value for the HTTP headers set in the request serializer.
+
+ @param field The HTTP header to retrieve the default value for
+ 
+ @return The value set as default for the specified header, or `nil`
+ */
+- (NSString *)valueForHTTPHeaderField:(NSString *)field;
+
+/**
+ Sets the "Authorization" HTTP header set in request objects made by the HTTP client to a basic authentication value with Base64-encoded username and password. This overwrites any existing value for this header.
+
+ @param username The HTTP basic auth username
+ @param password The HTTP basic auth password
+ */
+- (void)setAuthorizationHeaderFieldWithUsername:(NSString *)username
+                                       password:(NSString *)password;
+
+/**
+ @deprecated This method has been deprecated. Use -setValue:forHTTPHeaderField: instead.
+ */
+- (void)setAuthorizationHeaderFieldWithToken:(NSString *)token DEPRECATED_ATTRIBUTE;
+
+
+/**
+ Clears any existing value for the "Authorization" HTTP header.
+ */
+- (void)clearAuthorizationHeader;
+
+///-------------------------------------------------------
+/// @name Configuring Query String Parameter Serialization
+///-------------------------------------------------------
+
+/**
+ HTTP methods for which serialized requests will encode parameters as a query string. `GET`, `HEAD`, and `DELETE` by default.
+ */
+@property (nonatomic, strong) NSSet *HTTPMethodsEncodingParametersInURI;
+
+/**
+ Set the method of query string serialization according to one of the pre-defined styles.
+
+ @param style The serialization style.
+
+ @see AFHTTPRequestQueryStringSerializationStyle
+ */
+- (void)setQueryStringSerializationWithStyle:(AFHTTPRequestQueryStringSerializationStyle)style;
+
+/**
+ Set the a custom method of query string serialization according to the specified block.
+
+ @param block A block that defines a process of encoding parameters into a query string. This block returns the query string and takes three arguments: the request, the parameters to encode, and the error that occurred when attempting to encode parameters for the given request.
+ */
+- (void)setQueryStringSerializationWithBlock:(NSString * (^)(NSURLRequest *request, NSDictionary *parameters, NSError * __autoreleasing *error))block;
+
+///-------------------------------
+/// @name Creating Request Objects
+///-------------------------------
+
+/**
+ @deprecated This method has been deprecated. Use -requestWithMethod:URLString:parameters:error: instead.
+ */
+- (NSMutableURLRequest *)requestWithMethod:(NSString *)method
+                                 URLString:(NSString *)URLString
+                                parameters:(id)parameters DEPRECATED_ATTRIBUTE;
+
+/**
+ Creates an `NSMutableURLRequest` object with the specified HTTP method and URL string.
+
+ If the HTTP method is `GET`, `HEAD`, or `DELETE`, the parameters will be used to construct a url-encoded query string that is appended to the request's URL. Otherwise, the parameters will be encoded according to the value of the `parameterEncoding` property, and set as the request body.
+
+ @param method The HTTP method for the request, such as `GET`, `POST`, `PUT`, or `DELETE`. This parameter must not be `nil`.
+ @param URLString The URL string used to create the request URL.
+ @param parameters The parameters to be either set as a query string for `GET` requests, or the request HTTP body.
+ @param error The error that occured while constructing the request.
+
+ @return An `NSMutableURLRequest` object.
+ */
+- (NSMutableURLRequest *)requestWithMethod:(NSString *)method
+                                 URLString:(NSString *)URLString
+                                parameters:(id)parameters
+                                     error:(NSError * __autoreleasing *)error;
+
+/**
+ @deprecated This method has been deprecated. Use -multipartFormRequestWithMethod:URLString:parameters:constructingBodyWithBlock:error: instead.
+ */
+- (NSMutableURLRequest *)multipartFormRequestWithMethod:(NSString *)method
+                                              URLString:(NSString *)URLString
+                                             parameters:(NSDictionary *)parameters
+                              constructingBodyWithBlock:(void (^)(id <AFMultipartFormData> formData))block DEPRECATED_ATTRIBUTE;
+
+/**
+ Creates an `NSMutableURLRequest` object with the specified HTTP method and URLString, and constructs a `multipart/form-data` HTTP body, using the specified parameters and multipart form data block. See http://www.w3.org/TR/html4/interact/forms.html#h-17.13.4.2
+
+ Multipart form requests are automatically streamed, reading files directly from disk along with in-memory data in a single HTTP body. The resulting `NSMutableURLRequest` object has an `HTTPBodyStream` property, so refrain from setting `HTTPBodyStream` or `HTTPBody` on this request object, as it will clear out the multipart form body stream.
+
+ @param method The HTTP method for the request. This parameter must not be `GET` or `HEAD`, or `nil`.
+ @param URLString The URL string used to create the request URL.
+ @param parameters The parameters to be encoded and set in the request HTTP body.
+ @param block A block that takes a single argument and appends data to the HTTP body. The block argument is an object adopting the `AFMultipartFormData` protocol.
+ @param error The error that occured while constructing the request.
+
+ @return An `NSMutableURLRequest` object
+ */
+- (NSMutableURLRequest *)multipartFormRequestWithMethod:(NSString *)method
+                                              URLString:(NSString *)URLString
+                                             parameters:(NSDictionary *)parameters
+                              constructingBodyWithBlock:(void (^)(id <AFMultipartFormData> formData))block
+                                                  error:(NSError * __autoreleasing *)error;
+
+/**
+ Creates an `NSMutableURLRequest` by removing the `HTTPBodyStream` from a request, and asynchronously writing its contents into the specified file, invoking the completion handler when finished.
+ 
+ @param request The multipart form request.
+ @param fileURL The file URL to write multipart form contents to.
+ @param handler A handler block to execute.
+ 
+ @discussion There is a bug in `NSURLSessionTask` that causes requests to not send a `Content-Length` header when streaming contents from an HTTP body, which is notably problematic when interacting with the Amazon S3 webservice. As a workaround, this method takes a request constructed with `multipartFormRequestWithMethod:URLString:parameters:constructingBodyWithBlock:error:`, or any other request with an `HTTPBodyStream`, writes the contents to the specified file and returns a copy of the original request with the `HTTPBodyStream` property set to `nil`. From here, the file can either be passed to `AFURLSessionManager -uploadTaskWithRequest:fromFile:progress:completionHandler:`, or have its contents read into an `NSData` that's assigned to the `HTTPBody` property of the request.
+
+ @see https://github.com/AFNetworking/AFNetworking/issues/1398
+ */
+- (NSMutableURLRequest *)requestWithMultipartFormRequest:(NSURLRequest *)request
+                             writingStreamContentsToFile:(NSURL *)fileURL
+                                       completionHandler:(void (^)(NSError *error))handler;
+
+@end
+
+#pragma mark -
+
+/**
+ The `AFMultipartFormData` protocol defines the methods supported by the parameter in the block argument of `AFHTTPRequestSerializer -multipartFormRequestWithMethod:URLString:parameters:constructingBodyWithBlock:`.
+ */
+@protocol AFMultipartFormData
+
+/**
+ Appends the HTTP header `Content-Disposition: file; filename=#{generated filename}; name=#{name}"` and `Content-Type: #{generated mimeType}`, followed by the encoded file data and the multipart form boundary.
+
+ The filename and MIME type for this data in the form will be automatically generated, using the last path component of the `fileURL` and system associated MIME type for the `fileURL` extension, respectively.
+
+ @param fileURL The URL corresponding to the file whose content will be appended to the form. This parameter must not be `nil`.
+ @param name The name to be associated with the specified data. This parameter must not be `nil`.
+ @param error If an error occurs, upon return contains an `NSError` object that describes the problem.
+
+ @return `YES` if the file data was successfully appended, otherwise `NO`.
+ */
+- (BOOL)appendPartWithFileURL:(NSURL *)fileURL
+                         name:(NSString *)name
+                        error:(NSError * __autoreleasing *)error;
+
+/**
+ Appends the HTTP header `Content-Disposition: file; filename=#{filename}; name=#{name}"` and `Content-Type: #{mimeType}`, followed by the encoded file data and the multipart form boundary.
+
+ @param fileURL The URL corresponding to the file whose content will be appended to the form. This parameter must not be `nil`.
+ @param name The name to be associated with the specified data. This parameter must not be `nil`.
+ @param fileName The file name to be used in the `Content-Disposition` header. This parameter must not be `nil`.
+ @param mimeType The declared MIME type of the file data. This parameter must not be `nil`.
+ @param error If an error occurs, upon return contains an `NSError` object that describes the problem.
+
+ @return `YES` if the file data was successfully appended otherwise `NO`.
+ */
+- (BOOL)appendPartWithFileURL:(NSURL *)fileURL
+                         name:(NSString *)name
+                     fileName:(NSString *)fileName
+                     mimeType:(NSString *)mimeType
+                        error:(NSError * __autoreleasing *)error;
+
+/**
+ Appends the HTTP header `Content-Disposition: file; filename=#{filename}; name=#{name}"` and `Content-Type: #{mimeType}`, followed by the data from the input stream and the multipart form boundary.
+
+ @param inputStream The input stream to be appended to the form data
+ @param name The name to be associated with the specified input stream. This parameter must not be `nil`.
+ @param fileName The filename to be associated with the specified input stream. This parameter must not be `nil`.
+ @param length The length of the specified input stream in bytes.
+ @param mimeType The MIME type of the specified data. (For example, the MIME type for a JPEG image is image/jpeg.) For a list of valid MIME types, see http://www.iana.org/assignments/media-types/. This parameter must not be `nil`.
+ */
+- (void)appendPartWithInputStream:(NSInputStream *)inputStream
+                             name:(NSString *)name
+                         fileName:(NSString *)fileName
+                           length:(int64_t)length
+                         mimeType:(NSString *)mimeType;
+
+/**
+ Appends the HTTP header `Content-Disposition: file; filename=#{filename}; name=#{name}"` and `Content-Type: #{mimeType}`, followed by the encoded file data and the multipart form boundary.
+
+ @param data The data to be encoded and appended to the form data.
+ @param name The name to be associated with the specified data. This parameter must not be `nil`.
+ @param fileName The filename to be associated with the specified data. This parameter must not be `nil`.
+ @param mimeType The MIME type of the specified data. (For example, the MIME type for a JPEG image is image/jpeg.) For a list of valid MIME types, see http://www.iana.org/assignments/media-types/. This parameter must not be `nil`.
+ */
+- (void)appendPartWithFileData:(NSData *)data
+                          name:(NSString *)name
+                      fileName:(NSString *)fileName
+                      mimeType:(NSString *)mimeType;
+
+/**
+ Appends the HTTP headers `Content-Disposition: form-data; name=#{name}"`, followed by the encoded data and the multipart form boundary.
+
+ @param data The data to be encoded and appended to the form data.
+ @param name The name to be associated with the specified data. This parameter must not be `nil`.
+ */
+
+- (void)appendPartWithFormData:(NSData *)data
+                          name:(NSString *)name;
+
+
+/**
+ Appends HTTP headers, followed by the encoded data and the multipart form boundary.
+
+ @param headers The HTTP headers to be appended to the form data.
+ @param body The data to be encoded and appended to the form data. This parameter must not be `nil`.
+ */
+- (void)appendPartWithHeaders:(NSDictionary *)headers
+                         body:(NSData *)body;
+
+/**
+ Throttles request bandwidth by limiting the packet size and adding a delay for each chunk read from the upload stream.
+
+ When uploading over a 3G or EDGE connection, requests may fail with "request body stream exhausted". Setting a maximum packet size and delay according to the recommended values (`kAFUploadStream3GSuggestedPacketSize` and `kAFUploadStream3GSuggestedDelay`) lowers the risk of the input stream exceeding its allocated bandwidth. Unfortunately, there is no definite way to distinguish between a 3G, EDGE, or LTE connection over `NSURLConnection`. As such, it is not recommended that you throttle bandwidth based solely on network reachability. Instead, you should consider checking for the "request body stream exhausted" in a failure block, and then retrying the request with throttled bandwidth.
+
+ @param numberOfBytes Maximum packet size, in number of bytes. The default packet size for an input stream is 16kb.
+ @param delay Duration of delay each time a packet is read. By default, no delay is set.
+ */
+- (void)throttleBandwidthWithPacketSize:(NSUInteger)numberOfBytes
+                                  delay:(NSTimeInterval)delay;
+
+@end
+
+#pragma mark -
+
+/**
+ `AFJSONRequestSerializer` is a subclass of `AFHTTPRequestSerializer` that encodes parameters as JSON using `NSJSONSerialization`, setting the `Content-Type` of the encoded request to `application/json`.
+ */
+@interface AFJSONRequestSerializer : AFHTTPRequestSerializer
+
+/**
+ Options for writing the request JSON data from Foundation objects. For possible values, see the `NSJSONSerialization` documentation section "NSJSONWritingOptions". `0` by default.
+ */
+@property (nonatomic, assign) NSJSONWritingOptions writingOptions;
+
+/**
+ Creates and returns a JSON serializer with specified reading and writing options.
+
+ @param writingOptions The specified JSON writing options.
+ */
++ (instancetype)serializerWithWritingOptions:(NSJSONWritingOptions)writingOptions;
+
+@end
+
+#pragma mark -
+
+/**
+ `AFPropertyListRequestSerializer` is a subclass of `AFHTTPRequestSerializer` that encodes parameters as JSON using `NSPropertyListSerializer`, setting the `Content-Type` of the encoded request to `application/x-plist`.
+ */
+@interface AFPropertyListRequestSerializer : AFHTTPRequestSerializer
+
+/**
+ The property list format. Possible values are described in "NSPropertyListFormat".
+ */
+@property (nonatomic, assign) NSPropertyListFormat format;
+
+/**
+ @warning The `writeOptions` property is currently unused.
+ */
+@property (nonatomic, assign) NSPropertyListWriteOptions writeOptions;
+
+/**
+ Creates and returns a property list serializer with a specified format, read options, and write options.
+
+ @param format The property list format.
+ @param writeOptions The property list write options.
+ 
+ @warning The `writeOptions` property is currently unused.
+ */
++ (instancetype)serializerWithFormat:(NSPropertyListFormat)format
+                        writeOptions:(NSPropertyListWriteOptions)writeOptions;
+
+@end
+
+#pragma mark -
+
+///----------------
+/// @name Constants
+///----------------
+
+/**
+ ## Error Domains
+
+ The following error domain is predefined.
+
+ - `NSString * const AFURLRequestSerializationErrorDomain`
+
+ ### Constants
+
+ `AFURLRequestSerializationErrorDomain`
+ AFURLRequestSerializer errors. Error codes for `AFURLRequestSerializationErrorDomain` correspond to codes in `NSURLErrorDomain`.
+ */
+extern NSString * const AFURLRequestSerializationErrorDomain;
+
+/**
+ ## User info dictionary keys
+
+ These keys may exist in the user info dictionary, in addition to those defined for NSError.
+
+ - `NSString * const AFNetworkingOperationFailingURLRequestErrorKey`
+
+ ### Constants
+
+ `AFNetworkingOperationFailingURLRequestErrorKey`
+ The corresponding value is an `NSURLRequest` containing the request of the operation associated with an error. This key is only present in the `AFURLRequestSerializationErrorDomain`.
+ */
+extern NSString * const AFNetworkingOperationFailingURLRequestErrorKey;
+
+/**
+ ## Throttling Bandwidth for HTTP Request Input Streams
+
+ @see -throttleBandwidthWithPacketSize:delay:
+
+ ### Constants
+
+ `kAFUploadStream3GSuggestedPacketSize`
+ Maximum packet size, in number of bytes. Equal to 16kb.
+
+ `kAFUploadStream3GSuggestedDelay`
+ Duration of delay each time a packet is read. Equal to 0.2 seconds.
+ */
+extern NSUInteger const kAFUploadStream3GSuggestedPacketSize;
+extern NSTimeInterval const kAFUploadStream3GSuggestedDelay;
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLRequestSerialization.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLRequestSerialization.m
new file mode 100644
index 000000000..a56e8542e
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLRequestSerialization.m
@@ -0,0 +1,1339 @@
+// AFSerialization.h
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import "AFURLRequestSerialization.h"
+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED
+#import <MobileCoreServices/MobileCoreServices.h>
+#else
+#import <CoreServices/CoreServices.h>
+#endif
+
+NSString * const AFURLRequestSerializationErrorDomain = @"com.alamofire.error.serialization.request";
+NSString * const AFNetworkingOperationFailingURLRequestErrorKey = @"com.alamofire.serialization.request.error.response";
+
+typedef NSString * (^AFQueryStringSerializationBlock)(NSURLRequest *request, NSDictionary *parameters, NSError *__autoreleasing *error);
+
+static NSString * AFBase64EncodedStringFromString(NSString *string) {
+    NSData *data = [NSData dataWithBytes:[string UTF8String] length:[string lengthOfBytesUsingEncoding:NSUTF8StringEncoding]];
+    NSUInteger length = [data length];
+    NSMutableData *mutableData = [NSMutableData dataWithLength:((length + 2) / 3) * 4];
+
+    uint8_t *input = (uint8_t *)[data bytes];
+    uint8_t *output = (uint8_t *)[mutableData mutableBytes];
+
+    for (NSUInteger i = 0; i < length; i += 3) {
+        NSUInteger value = 0;
+        for (NSUInteger j = i; j < (i + 3); j++) {
+            value <<= 8;
+            if (j < length) {
+                value |= (0xFF & input[j]);
+            }
+        }
+
+        static uint8_t const kAFBase64EncodingTable[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+        NSUInteger idx = (i / 3) * 4;
+        output[idx + 0] = kAFBase64EncodingTable[(value >> 18) & 0x3F];
+        output[idx + 1] = kAFBase64EncodingTable[(value >> 12) & 0x3F];
+        output[idx + 2] = (i + 1) < length ? kAFBase64EncodingTable[(value >> 6)  & 0x3F] : '=';
+        output[idx + 3] = (i + 2) < length ? kAFBase64EncodingTable[(value >> 0)  & 0x3F] : '=';
+    }
+
+    return [[NSString alloc] initWithData:mutableData encoding:NSASCIIStringEncoding];
+}
+
+static NSString * const kAFCharactersToBeEscapedInQueryString = @":/?&=;+!@#$()',*";
+
+static NSString * AFPercentEscapedQueryStringKeyFromStringWithEncoding(NSString *string, NSStringEncoding encoding) {
+    static NSString * const kAFCharactersToLeaveUnescapedInQueryStringPairKey = @"[].";
+
+	return (__bridge_transfer  NSString *)CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, (__bridge CFStringRef)string, (__bridge CFStringRef)kAFCharactersToLeaveUnescapedInQueryStringPairKey, (__bridge CFStringRef)kAFCharactersToBeEscapedInQueryString, CFStringConvertNSStringEncodingToEncoding(encoding));
+}
+
+static NSString * AFPercentEscapedQueryStringValueFromStringWithEncoding(NSString *string, NSStringEncoding encoding) {
+	return (__bridge_transfer  NSString *)CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, (__bridge CFStringRef)string, NULL, (__bridge CFStringRef)kAFCharactersToBeEscapedInQueryString, CFStringConvertNSStringEncodingToEncoding(encoding));
+}
+
+#pragma mark -
+
+@interface AFQueryStringPair : NSObject
+@property (readwrite, nonatomic, strong) id field;
+@property (readwrite, nonatomic, strong) id value;
+
+- (id)initWithField:(id)field value:(id)value;
+
+- (NSString *)URLEncodedStringValueWithEncoding:(NSStringEncoding)stringEncoding;
+@end
+
+@implementation AFQueryStringPair
+
+- (id)initWithField:(id)field value:(id)value {
+    self = [super init];
+    if (!self) {
+        return nil;
+    }
+
+    self.field = field;
+    self.value = value;
+
+    return self;
+}
+
+- (NSString *)URLEncodedStringValueWithEncoding:(NSStringEncoding)stringEncoding {
+    if (!self.value || [self.value isEqual:[NSNull null]]) {
+        return AFPercentEscapedQueryStringKeyFromStringWithEncoding([self.field description], stringEncoding);
+    } else {
+        return [NSString stringWithFormat:@"%@=%@", AFPercentEscapedQueryStringKeyFromStringWithEncoding([self.field description], stringEncoding), AFPercentEscapedQueryStringValueFromStringWithEncoding([self.value description], stringEncoding)];
+    }
+}
+
+@end
+
+#pragma mark -
+
+extern NSArray * AFQueryStringPairsFromDictionary(NSDictionary *dictionary);
+extern NSArray * AFQueryStringPairsFromKeyAndValue(NSString *key, id value);
+
+static NSString * AFQueryStringFromParametersWithEncoding(NSDictionary *parameters, NSStringEncoding stringEncoding) {
+    NSMutableArray *mutablePairs = [NSMutableArray array];
+    for (AFQueryStringPair *pair in AFQueryStringPairsFromDictionary(parameters)) {
+        [mutablePairs addObject:[pair URLEncodedStringValueWithEncoding:stringEncoding]];
+    }
+
+    return [mutablePairs componentsJoinedByString:@"&"];
+}
+
+NSArray * AFQueryStringPairsFromDictionary(NSDictionary *dictionary) {
+    return AFQueryStringPairsFromKeyAndValue(nil, dictionary);
+}
+
+NSArray * AFQueryStringPairsFromKeyAndValue(NSString *key, id value) {
+    NSMutableArray *mutableQueryStringComponents = [NSMutableArray array];
+
+    NSSortDescriptor *sortDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"description" ascending:YES selector:@selector(compare:)];
+
+    if ([value isKindOfClass:[NSDictionary class]]) {
+        NSDictionary *dictionary = value;
+        // Sort dictionary keys to ensure consistent ordering in query string, which is important when deserializing potentially ambiguous sequences, such as an array of dictionaries
+        for (id nestedKey in [dictionary.allKeys sortedArrayUsingDescriptors:@[ sortDescriptor ]]) {
+            id nestedValue = [dictionary objectForKey:nestedKey];
+            if (nestedValue) {
+                [mutableQueryStringComponents addObjectsFromArray:AFQueryStringPairsFromKeyAndValue((key ? [NSString stringWithFormat:@"%@[%@]", key, nestedKey] : nestedKey), nestedValue)];
+            }
+        }
+    } else if ([value isKindOfClass:[NSArray class]]) {
+        NSArray *array = value;
+        for (id nestedValue in array) {
+            [mutableQueryStringComponents addObjectsFromArray:AFQueryStringPairsFromKeyAndValue([NSString stringWithFormat:@"%@[]", key], nestedValue)];
+        }
+    } else if ([value isKindOfClass:[NSSet class]]) {
+        NSSet *set = value;
+        for (id obj in [set sortedArrayUsingDescriptors:@[ sortDescriptor ]]) {
+            [mutableQueryStringComponents addObjectsFromArray:AFQueryStringPairsFromKeyAndValue(key, obj)];
+        }
+    } else {
+        [mutableQueryStringComponents addObject:[[AFQueryStringPair alloc] initWithField:key value:value]];
+    }
+    
+    return mutableQueryStringComponents;
+}
+
+#pragma mark -
+
+@interface AFStreamingMultipartFormData : NSObject <AFMultipartFormData>
+- (instancetype)initWithURLRequest:(NSMutableURLRequest *)urlRequest
+                    stringEncoding:(NSStringEncoding)encoding;
+
+- (NSMutableURLRequest *)requestByFinalizingMultipartFormData;
+@end
+
+#pragma mark -
+
+static NSArray * AFHTTPRequestSerializerObservedKeyPaths() {
+    static NSArray *_AFHTTPRequestSerializerObservedKeyPaths = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        _AFHTTPRequestSerializerObservedKeyPaths = @[NSStringFromSelector(@selector(allowsCellularAccess)), NSStringFromSelector(@selector(cachePolicy)), NSStringFromSelector(@selector(HTTPShouldHandleCookies)), NSStringFromSelector(@selector(HTTPShouldUsePipelining)), NSStringFromSelector(@selector(networkServiceType)), NSStringFromSelector(@selector(timeoutInterval))];
+    });
+
+    return _AFHTTPRequestSerializerObservedKeyPaths;
+}
+
+static void *AFHTTPRequestSerializerObserverContext = &AFHTTPRequestSerializerObserverContext;
+
+@interface AFHTTPRequestSerializer ()
+@property (readwrite, nonatomic, strong) NSMutableSet *mutableObservedChangedKeyPaths;
+@property (readwrite, nonatomic, strong) NSMutableDictionary *mutableHTTPRequestHeaders;
+@property (readwrite, nonatomic, assign) AFHTTPRequestQueryStringSerializationStyle queryStringSerializationStyle;
+@property (readwrite, nonatomic, copy) AFQueryStringSerializationBlock queryStringSerialization;
+@end
+
+@implementation AFHTTPRequestSerializer
+
++ (instancetype)serializer {
+    return [[self alloc] init];
+}
+
+- (instancetype)init {
+    self = [super init];
+    if (!self) {
+        return nil;
+    }
+
+    self.stringEncoding = NSUTF8StringEncoding;
+
+    self.mutableHTTPRequestHeaders = [NSMutableDictionary dictionary];
+
+    // Accept-Language HTTP Header; see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4
+    NSMutableArray *acceptLanguagesComponents = [NSMutableArray array];
+    [[NSLocale preferredLanguages] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+        float q = 1.0f - (idx * 0.1f);
+        [acceptLanguagesComponents addObject:[NSString stringWithFormat:@"%@;q=%0.1g", obj, q]];
+        *stop = q <= 0.5f;
+    }];
+    [self setValue:[acceptLanguagesComponents componentsJoinedByString:@", "] forHTTPHeaderField:@"Accept-Language"];
+
+    NSString *userAgent = nil;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu"
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+    // User-Agent Header; see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.43
+    userAgent = [NSString stringWithFormat:@"%@/%@ (%@; iOS %@; Scale/%0.2f)", [[[NSBundle mainBundle] infoDictionary] objectForKey:(__bridge NSString *)kCFBundleExecutableKey] ?: [[[NSBundle mainBundle] infoDictionary] objectForKey:(__bridge NSString *)kCFBundleIdentifierKey], [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"] ?: [[[NSBundle mainBundle] infoDictionary] objectForKey:(__bridge NSString *)kCFBundleVersionKey], [[UIDevice currentDevice] model], [[UIDevice currentDevice] systemVersion], [[UIScreen mainScreen] scale]];
+#elif defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
+    userAgent = [NSString stringWithFormat:@"%@/%@ (Mac OS X %@)", [[[NSBundle mainBundle] infoDictionary] objectForKey:(__bridge NSString *)kCFBundleExecutableKey] ?: [[[NSBundle mainBundle] infoDictionary] objectForKey:(__bridge NSString *)kCFBundleIdentifierKey], [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"] ?: [[[NSBundle mainBundle] infoDictionary] objectForKey:(__bridge NSString *)kCFBundleVersionKey], [[NSProcessInfo processInfo] operatingSystemVersionString]];
+#endif
+#pragma clang diagnostic pop
+    if (userAgent) {
+        if (![userAgent canBeConvertedToEncoding:NSASCIIStringEncoding]) {
+            NSMutableString *mutableUserAgent = [userAgent mutableCopy];
+            if (CFStringTransform((__bridge CFMutableStringRef)(mutableUserAgent), NULL, (__bridge CFStringRef)@"Any-Latin; Latin-ASCII; [:^ASCII:] Remove", false)) {
+                userAgent = mutableUserAgent;
+            }
+        }
+        [self setValue:userAgent forHTTPHeaderField:@"User-Agent"];
+    }
+
+    // HTTP Method Definitions; see http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html
+    self.HTTPMethodsEncodingParametersInURI = [NSSet setWithObjects:@"GET", @"HEAD", @"DELETE", nil];
+
+    self.mutableObservedChangedKeyPaths = [NSMutableSet set];
+    for (NSString *keyPath in AFHTTPRequestSerializerObservedKeyPaths()) {
+        if ([self respondsToSelector:NSSelectorFromString(keyPath)]) {
+            [self addObserver:self forKeyPath:keyPath options:NSKeyValueObservingOptionNew context:AFHTTPRequestSerializerObserverContext];
+        }
+    }
+
+    return self;
+}
+
+- (void)dealloc {
+    for (NSString *keyPath in AFHTTPRequestSerializerObservedKeyPaths()) {
+        if ([self respondsToSelector:NSSelectorFromString(keyPath)]) {
+            [self removeObserver:self forKeyPath:keyPath context:AFHTTPRequestSerializerObserverContext];
+        }
+    }
+}
+
+#pragma mark -
+
+- (NSDictionary *)HTTPRequestHeaders {
+    return [NSDictionary dictionaryWithDictionary:self.mutableHTTPRequestHeaders];
+}
+
+- (void)setValue:(NSString *)value
+forHTTPHeaderField:(NSString *)field
+{
+	[self.mutableHTTPRequestHeaders setValue:value forKey:field];
+}
+
+- (NSString *)valueForHTTPHeaderField:(NSString *)field {
+    return [self.mutableHTTPRequestHeaders valueForKey:field];
+}
+
+- (void)setAuthorizationHeaderFieldWithUsername:(NSString *)username
+                                       password:(NSString *)password
+{
+	NSString *basicAuthCredentials = [NSString stringWithFormat:@"%@:%@", username, password];
+    [self setValue:[NSString stringWithFormat:@"Basic %@", AFBase64EncodedStringFromString(basicAuthCredentials)] forHTTPHeaderField:@"Authorization"];
+}
+
+- (void)setAuthorizationHeaderFieldWithToken:(NSString *)token {
+    [self setValue:[NSString stringWithFormat:@"Token token=\"%@\"", token] forHTTPHeaderField:@"Authorization"];
+}
+
+- (void)clearAuthorizationHeader {
+	[self.mutableHTTPRequestHeaders removeObjectForKey:@"Authorization"];
+}
+
+#pragma mark -
+
+- (void)setQueryStringSerializationWithStyle:(AFHTTPRequestQueryStringSerializationStyle)style {
+    self.queryStringSerializationStyle = style;
+    self.queryStringSerialization = nil;
+}
+
+- (void)setQueryStringSerializationWithBlock:(NSString *(^)(NSURLRequest *, NSDictionary *, NSError *__autoreleasing *))block {
+    self.queryStringSerialization = block;
+}
+
+#pragma mark -
+
+- (NSMutableURLRequest *)requestWithMethod:(NSString *)method
+                                 URLString:(NSString *)URLString
+                                parameters:(id)parameters
+{
+    return [self requestWithMethod:method URLString:URLString parameters:parameters error:nil];
+}
+
+- (NSMutableURLRequest *)requestWithMethod:(NSString *)method
+                                 URLString:(NSString *)URLString
+                                parameters:(id)parameters
+                                     error:(NSError *__autoreleasing *)error
+{
+    NSParameterAssert(method);
+    NSParameterAssert(URLString);
+
+    NSURL *url = [NSURL URLWithString:URLString];
+
+    NSParameterAssert(url);
+
+    NSMutableURLRequest *mutableRequest = [[NSMutableURLRequest alloc] initWithURL:url];
+    mutableRequest.HTTPMethod = method;
+
+    for (NSString *keyPath in AFHTTPRequestSerializerObservedKeyPaths()) {
+        if ([self.mutableObservedChangedKeyPaths containsObject:keyPath]) {
+            [mutableRequest setValue:[self valueForKeyPath:keyPath] forKey:keyPath];
+        }
+    }
+
+    mutableRequest = [[self requestBySerializingRequest:mutableRequest withParameters:parameters error:error] mutableCopy];
+
+	return mutableRequest;
+}
+
+- (NSMutableURLRequest *)multipartFormRequestWithMethod:(NSString *)method
+                                              URLString:(NSString *)URLString
+                                             parameters:(NSDictionary *)parameters
+                              constructingBodyWithBlock:(void (^)(id <AFMultipartFormData> formData))block
+{
+    return [self multipartFormRequestWithMethod:method URLString:URLString parameters:parameters constructingBodyWithBlock:block error:nil];
+}
+
+- (NSMutableURLRequest *)multipartFormRequestWithMethod:(NSString *)method
+                                              URLString:(NSString *)URLString
+                                             parameters:(NSDictionary *)parameters
+                              constructingBodyWithBlock:(void (^)(id <AFMultipartFormData> formData))block
+                                                  error:(NSError *__autoreleasing *)error
+{
+    NSParameterAssert(method);
+    NSParameterAssert(![method isEqualToString:@"GET"] && ![method isEqualToString:@"HEAD"]);
+
+    NSMutableURLRequest *mutableRequest = [self requestWithMethod:method URLString:URLString parameters:nil error:error];
+
+    __block AFStreamingMultipartFormData *formData = [[AFStreamingMultipartFormData alloc] initWithURLRequest:mutableRequest stringEncoding:NSUTF8StringEncoding];
+
+    if (parameters) {
+        for (AFQueryStringPair *pair in AFQueryStringPairsFromDictionary(parameters)) {
+            NSData *data = nil;
+            if ([pair.value isKindOfClass:[NSData class]]) {
+                data = pair.value;
+            } else if ([pair.value isEqual:[NSNull null]]) {
+                data = [NSData data];
+            } else {
+                data = [[pair.value description] dataUsingEncoding:self.stringEncoding];
+            }
+
+            if (data) {
+                [formData appendPartWithFormData:data name:[pair.field description]];
+            }
+        }
+    }
+
+    if (block) {
+        block(formData);
+    }
+
+    return [formData requestByFinalizingMultipartFormData];
+}
+
+- (NSMutableURLRequest *)requestWithMultipartFormRequest:(NSURLRequest *)request
+                             writingStreamContentsToFile:(NSURL *)fileURL
+                                       completionHandler:(void (^)(NSError *error))handler
+{
+    if (!request.HTTPBodyStream) {
+        return [request mutableCopy];
+    }
+
+    NSParameterAssert([fileURL isFileURL]);
+
+    NSInputStream *inputStream = request.HTTPBodyStream;
+    NSOutputStream *outputStream = [[NSOutputStream alloc] initWithURL:fileURL append:NO];
+    __block NSError *error = nil;
+
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        [inputStream scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
+        [outputStream scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
+
+        [inputStream open];
+        [outputStream open];
+
+        while ([inputStream hasBytesAvailable] && [outputStream hasSpaceAvailable]) {
+            uint8_t buffer[1024];
+
+            NSInteger bytesRead = [inputStream read:buffer maxLength:1024];
+            if (inputStream.streamError || bytesRead < 0) {
+                error = inputStream.streamError;
+                break;
+            }
+
+            NSInteger bytesWritten = [outputStream write:buffer maxLength:(NSUInteger)bytesRead];
+            if (outputStream.streamError || bytesWritten < 0) {
+                error = outputStream.streamError;
+                break;
+            }
+
+            if (bytesRead == 0 && bytesWritten == 0) {
+                break;
+            }
+        }
+
+        [outputStream close];
+        [inputStream close];
+
+        if (handler) {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                handler(error);
+            });
+        }
+    });
+
+    NSMutableURLRequest *mutableRequest = [request mutableCopy];
+    mutableRequest.HTTPBodyStream = nil;
+
+    return mutableRequest;
+}
+
+#pragma mark - AFURLRequestSerialization
+
+- (NSURLRequest *)requestBySerializingRequest:(NSURLRequest *)request
+                               withParameters:(id)parameters
+                                        error:(NSError *__autoreleasing *)error
+{
+    NSParameterAssert(request);
+
+    NSMutableURLRequest *mutableRequest = [request mutableCopy];
+
+    [self.HTTPRequestHeaders enumerateKeysAndObjectsUsingBlock:^(id field, id value, BOOL * __unused stop) {
+        if (![request valueForHTTPHeaderField:field]) {
+            [mutableRequest setValue:value forHTTPHeaderField:field];
+        }
+    }];
+
+    if (parameters) {
+        NSString *query = nil;
+        if (self.queryStringSerialization) {
+            NSError *serializationError;
+            query = self.queryStringSerialization(request, parameters, &serializationError);
+
+            if (serializationError) {
+                if (error) {
+                    *error = serializationError;
+                }
+
+                return nil;
+            }
+        } else {
+            switch (self.queryStringSerializationStyle) {
+                case AFHTTPRequestQueryStringDefaultStyle:
+                    query = AFQueryStringFromParametersWithEncoding(parameters, self.stringEncoding);
+                    break;
+            }
+        }
+
+        if ([self.HTTPMethodsEncodingParametersInURI containsObject:[[request HTTPMethod] uppercaseString]]) {
+            mutableRequest.URL = [NSURL URLWithString:[[mutableRequest.URL absoluteString] stringByAppendingFormat:mutableRequest.URL.query ? @"&%@" : @"?%@", query]];
+        } else {
+            if (![mutableRequest valueForHTTPHeaderField:@"Content-Type"]) {
+                [mutableRequest setValue:@"application/x-www-form-urlencoded" forHTTPHeaderField:@"Content-Type"];
+            }
+            [mutableRequest setHTTPBody:[query dataUsingEncoding:self.stringEncoding]];
+        }
+    }
+
+    return mutableRequest;
+}
+
+#pragma mark - NSKeyValueObserving
+
+- (void)observeValueForKeyPath:(NSString *)keyPath
+                      ofObject:(__unused id)object
+                        change:(NSDictionary *)change
+                       context:(void *)context
+{
+    if (context == AFHTTPRequestSerializerObserverContext) {
+        if ([change[NSKeyValueChangeNewKey] isEqual:[NSNull null]]) {
+            [self.mutableObservedChangedKeyPaths removeObject:keyPath];
+        } else {
+            [self.mutableObservedChangedKeyPaths addObject:keyPath];
+        }
+    }
+}
+
+#pragma mark - NSSecureCoding
+
++ (BOOL)supportsSecureCoding {
+    return YES;
+}
+
+- (id)initWithCoder:(NSCoder *)decoder {
+    self = [self init];
+    if (!self) {
+        return nil;
+    }
+
+    self.mutableHTTPRequestHeaders = [[decoder decodeObjectOfClass:[NSDictionary class] forKey:NSStringFromSelector(@selector(mutableHTTPRequestHeaders))] mutableCopy];
+    self.queryStringSerializationStyle = [[decoder decodeObjectOfClass:[NSNumber class] forKey:NSStringFromSelector(@selector(queryStringSerializationStyle))] unsignedIntegerValue];
+
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+    [coder encodeObject:self.mutableHTTPRequestHeaders forKey:NSStringFromSelector(@selector(mutableHTTPRequestHeaders))];
+    [coder encodeInteger:self.queryStringSerializationStyle forKey:NSStringFromSelector(@selector(queryStringSerializationStyle))];
+}
+
+#pragma mark - NSCopying
+
+- (id)copyWithZone:(NSZone *)zone {
+    AFHTTPRequestSerializer *serializer = [[[self class] allocWithZone:zone] init];
+    serializer.mutableHTTPRequestHeaders = [self.mutableHTTPRequestHeaders mutableCopyWithZone:zone];
+    serializer.queryStringSerializationStyle = self.queryStringSerializationStyle;
+    serializer.queryStringSerialization = self.queryStringSerialization;
+    
+    return serializer;
+}
+
+@end
+
+#pragma mark -
+
+static NSString * AFCreateMultipartFormBoundary() {
+    return [NSString stringWithFormat:@"Boundary+%08X%08X", arc4random(), arc4random()];
+}
+
+static NSString * const kAFMultipartFormCRLF = @"\r\n";
+
+static inline NSString * AFMultipartFormInitialBoundary(NSString *boundary) {
+    return [NSString stringWithFormat:@"--%@%@", boundary, kAFMultipartFormCRLF];
+}
+
+static inline NSString * AFMultipartFormEncapsulationBoundary(NSString *boundary) {
+    return [NSString stringWithFormat:@"%@--%@%@", kAFMultipartFormCRLF, boundary, kAFMultipartFormCRLF];
+}
+
+static inline NSString * AFMultipartFormFinalBoundary(NSString *boundary) {
+    return [NSString stringWithFormat:@"%@--%@--%@", kAFMultipartFormCRLF, boundary, kAFMultipartFormCRLF];
+}
+
+static inline NSString * AFContentTypeForPathExtension(NSString *extension) {
+#ifdef __UTTYPE__
+    NSString *UTI = (__bridge_transfer NSString *)UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, (__bridge CFStringRef)extension, NULL);
+    NSString *contentType = (__bridge_transfer NSString *)UTTypeCopyPreferredTagWithClass((__bridge CFStringRef)UTI, kUTTagClassMIMEType);
+    if (!contentType) {
+        return @"application/octet-stream";
+    } else {
+        return contentType;
+    }
+#else
+#pragma unused (extension)
+    return @"application/octet-stream";
+#endif
+}
+
+NSUInteger const kAFUploadStream3GSuggestedPacketSize = 1024 * 16;
+NSTimeInterval const kAFUploadStream3GSuggestedDelay = 0.2;
+
+@interface AFHTTPBodyPart : NSObject
+@property (nonatomic, assign) NSStringEncoding stringEncoding;
+@property (nonatomic, strong) NSDictionary *headers;
+@property (nonatomic, copy) NSString *boundary;
+@property (nonatomic, strong) id body;
+@property (nonatomic, assign) unsigned long long bodyContentLength;
+@property (nonatomic, strong) NSInputStream *inputStream;
+
+@property (nonatomic, assign) BOOL hasInitialBoundary;
+@property (nonatomic, assign) BOOL hasFinalBoundary;
+
+@property (readonly, nonatomic, assign, getter = hasBytesAvailable) BOOL bytesAvailable;
+@property (readonly, nonatomic, assign) unsigned long long contentLength;
+
+- (NSInteger)read:(uint8_t *)buffer
+        maxLength:(NSUInteger)length;
+@end
+
+@interface AFMultipartBodyStream : NSInputStream <NSStreamDelegate>
+@property (nonatomic, assign) NSUInteger numberOfBytesInPacket;
+@property (nonatomic, assign) NSTimeInterval delay;
+@property (nonatomic, strong) NSInputStream *inputStream;
+@property (readonly, nonatomic, assign) unsigned long long contentLength;
+@property (readonly, nonatomic, assign, getter = isEmpty) BOOL empty;
+
+- (id)initWithStringEncoding:(NSStringEncoding)encoding;
+- (void)setInitialAndFinalBoundaries;
+- (void)appendHTTPBodyPart:(AFHTTPBodyPart *)bodyPart;
+@end
+
+#pragma mark -
+
+@interface AFStreamingMultipartFormData ()
+@property (readwrite, nonatomic, copy) NSMutableURLRequest *request;
+@property (readwrite, nonatomic, assign) NSStringEncoding stringEncoding;
+@property (readwrite, nonatomic, copy) NSString *boundary;
+@property (readwrite, nonatomic, strong) AFMultipartBodyStream *bodyStream;
+@end
+
+@implementation AFStreamingMultipartFormData
+
+- (id)initWithURLRequest:(NSMutableURLRequest *)urlRequest
+          stringEncoding:(NSStringEncoding)encoding
+{
+    self = [super init];
+    if (!self) {
+        return nil;
+    }
+
+    self.request = urlRequest;
+    self.stringEncoding = encoding;
+    self.boundary = AFCreateMultipartFormBoundary();
+    self.bodyStream = [[AFMultipartBodyStream alloc] initWithStringEncoding:encoding];
+
+    return self;
+}
+
+- (BOOL)appendPartWithFileURL:(NSURL *)fileURL
+                         name:(NSString *)name
+                        error:(NSError * __autoreleasing *)error
+{
+    NSParameterAssert(fileURL);
+    NSParameterAssert(name);
+
+    NSString *fileName = [fileURL lastPathComponent];
+    NSString *mimeType = AFContentTypeForPathExtension([fileURL pathExtension]);
+
+    return [self appendPartWithFileURL:fileURL name:name fileName:fileName mimeType:mimeType error:error];
+}
+
+- (BOOL)appendPartWithFileURL:(NSURL *)fileURL
+                         name:(NSString *)name
+                     fileName:(NSString *)fileName
+                     mimeType:(NSString *)mimeType
+                        error:(NSError * __autoreleasing *)error
+{
+    NSParameterAssert(fileURL);
+    NSParameterAssert(name);
+    NSParameterAssert(fileName);
+    NSParameterAssert(mimeType);
+
+    if (![fileURL isFileURL]) {
+        NSDictionary *userInfo = @{NSLocalizedFailureReasonErrorKey: NSLocalizedStringFromTable(@"Expected URL to be a file URL", @"AFNetworking", nil)};
+        if (error) {
+            *error = [[NSError alloc] initWithDomain:AFURLRequestSerializationErrorDomain code:NSURLErrorBadURL userInfo:userInfo];
+        }
+
+        return NO;
+    } else if ([fileURL checkResourceIsReachableAndReturnError:error] == NO) {
+        NSDictionary *userInfo = @{NSLocalizedFailureReasonErrorKey: NSLocalizedStringFromTable(@"File URL not reachable.", @"AFNetworking", nil)};
+        if (error) {
+            *error = [[NSError alloc] initWithDomain:AFURLRequestSerializationErrorDomain code:NSURLErrorBadURL userInfo:userInfo];
+        }
+
+        return NO;
+    }
+
+    NSDictionary *fileAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:[fileURL path] error:error];
+    if (!fileAttributes) {
+        return NO;
+    }
+    
+    NSMutableDictionary *mutableHeaders = [NSMutableDictionary dictionary];
+    [mutableHeaders setValue:[NSString stringWithFormat:@"form-data; name=\"%@\"; filename=\"%@\"", name, fileName] forKey:@"Content-Disposition"];
+    [mutableHeaders setValue:mimeType forKey:@"Content-Type"];
+    
+    AFHTTPBodyPart *bodyPart = [[AFHTTPBodyPart alloc] init];
+    bodyPart.stringEncoding = self.stringEncoding;
+    bodyPart.headers = mutableHeaders;
+    bodyPart.boundary = self.boundary;
+    bodyPart.body = fileURL;
+    bodyPart.bodyContentLength = [[fileAttributes objectForKey:NSFileSize] unsignedLongLongValue];
+    [self.bodyStream appendHTTPBodyPart:bodyPart];
+
+    return YES;
+}
+
+- (void)appendPartWithInputStream:(NSInputStream *)inputStream
+                             name:(NSString *)name
+                         fileName:(NSString *)fileName
+                           length:(int64_t)length
+                         mimeType:(NSString *)mimeType
+{
+    NSParameterAssert(name);
+    NSParameterAssert(fileName);
+    NSParameterAssert(mimeType);
+
+    NSMutableDictionary *mutableHeaders = [NSMutableDictionary dictionary];
+    [mutableHeaders setValue:[NSString stringWithFormat:@"form-data; name=\"%@\"; filename=\"%@\"", name, fileName] forKey:@"Content-Disposition"];
+    [mutableHeaders setValue:mimeType forKey:@"Content-Type"];
+
+    AFHTTPBodyPart *bodyPart = [[AFHTTPBodyPart alloc] init];
+    bodyPart.stringEncoding = self.stringEncoding;
+    bodyPart.headers = mutableHeaders;
+    bodyPart.boundary = self.boundary;
+    bodyPart.body = inputStream;
+
+    bodyPart.bodyContentLength = (unsigned long long)length;
+
+    [self.bodyStream appendHTTPBodyPart:bodyPart];
+}
+
+- (void)appendPartWithFileData:(NSData *)data
+                          name:(NSString *)name
+                      fileName:(NSString *)fileName
+                      mimeType:(NSString *)mimeType
+{
+    NSParameterAssert(name);
+    NSParameterAssert(fileName);
+    NSParameterAssert(mimeType);
+
+    NSMutableDictionary *mutableHeaders = [NSMutableDictionary dictionary];
+    [mutableHeaders setValue:[NSString stringWithFormat:@"form-data; name=\"%@\"; filename=\"%@\"", name, fileName] forKey:@"Content-Disposition"];
+    [mutableHeaders setValue:mimeType forKey:@"Content-Type"];
+
+    [self appendPartWithHeaders:mutableHeaders body:data];
+}
+
+- (void)appendPartWithFormData:(NSData *)data
+                          name:(NSString *)name
+{
+    NSParameterAssert(name);
+
+    NSMutableDictionary *mutableHeaders = [NSMutableDictionary dictionary];
+    [mutableHeaders setValue:[NSString stringWithFormat:@"form-data; name=\"%@\"", name] forKey:@"Content-Disposition"];
+
+    [self appendPartWithHeaders:mutableHeaders body:data];
+}
+
+- (void)appendPartWithHeaders:(NSDictionary *)headers
+                         body:(NSData *)body
+{
+    NSParameterAssert(body);
+
+    AFHTTPBodyPart *bodyPart = [[AFHTTPBodyPart alloc] init];
+    bodyPart.stringEncoding = self.stringEncoding;
+    bodyPart.headers = headers;
+    bodyPart.boundary = self.boundary;
+    bodyPart.bodyContentLength = [body length];
+    bodyPart.body = body;
+
+    [self.bodyStream appendHTTPBodyPart:bodyPart];
+}
+
+- (void)throttleBandwidthWithPacketSize:(NSUInteger)numberOfBytes
+                                  delay:(NSTimeInterval)delay
+{
+    self.bodyStream.numberOfBytesInPacket = numberOfBytes;
+    self.bodyStream.delay = delay;
+}
+
+- (NSMutableURLRequest *)requestByFinalizingMultipartFormData {
+    if ([self.bodyStream isEmpty]) {
+        return self.request;
+    }
+
+    // Reset the initial and final boundaries to ensure correct Content-Length
+    [self.bodyStream setInitialAndFinalBoundaries];
+    [self.request setHTTPBodyStream:self.bodyStream];
+
+    [self.request setValue:[NSString stringWithFormat:@"multipart/form-data; boundary=%@", self.boundary] forHTTPHeaderField:@"Content-Type"];
+    [self.request setValue:[NSString stringWithFormat:@"%llu", [self.bodyStream contentLength]] forHTTPHeaderField:@"Content-Length"];
+
+    return self.request;
+}
+
+@end
+
+#pragma mark -
+
+@interface NSStream ()
+@property (readwrite) NSStreamStatus streamStatus;
+@property (readwrite, copy) NSError *streamError;
+@end
+
+@interface AFMultipartBodyStream () <NSCopying>
+@property (readwrite, nonatomic, assign) NSStringEncoding stringEncoding;
+@property (readwrite, nonatomic, strong) NSMutableArray *HTTPBodyParts;
+@property (readwrite, nonatomic, strong) NSEnumerator *HTTPBodyPartEnumerator;
+@property (readwrite, nonatomic, strong) AFHTTPBodyPart *currentHTTPBodyPart;
+@property (readwrite, nonatomic, strong) NSOutputStream *outputStream;
+@property (readwrite, nonatomic, strong) NSMutableData *buffer;
+@end
+
+@implementation AFMultipartBodyStream
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wimplicit-atomic-properties"
+#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000) || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1100)
+@synthesize delegate;
+#endif
+@synthesize streamStatus;
+@synthesize streamError;
+#pragma clang diagnostic pop
+
+- (id)initWithStringEncoding:(NSStringEncoding)encoding {
+    self = [super init];
+    if (!self) {
+        return nil;
+    }
+
+    self.stringEncoding = encoding;
+    self.HTTPBodyParts = [NSMutableArray array];
+    self.numberOfBytesInPacket = NSIntegerMax;
+
+    return self;
+}
+
+- (void)setInitialAndFinalBoundaries {
+    if ([self.HTTPBodyParts count] > 0) {
+        for (AFHTTPBodyPart *bodyPart in self.HTTPBodyParts) {
+            bodyPart.hasInitialBoundary = NO;
+            bodyPart.hasFinalBoundary = NO;
+        }
+
+        [[self.HTTPBodyParts objectAtIndex:0] setHasInitialBoundary:YES];
+        [[self.HTTPBodyParts lastObject] setHasFinalBoundary:YES];
+    }
+}
+
+- (void)appendHTTPBodyPart:(AFHTTPBodyPart *)bodyPart {
+    [self.HTTPBodyParts addObject:bodyPart];
+}
+
+- (BOOL)isEmpty {
+    return [self.HTTPBodyParts count] == 0;
+}
+
+#pragma mark - NSInputStream
+
+- (NSInteger)read:(uint8_t *)buffer
+        maxLength:(NSUInteger)length
+{
+    if ([self streamStatus] == NSStreamStatusClosed) {
+        return 0;
+    }
+
+    NSInteger totalNumberOfBytesRead = 0;
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu"
+    while ((NSUInteger)totalNumberOfBytesRead < MIN(length, self.numberOfBytesInPacket)) {
+        if (!self.currentHTTPBodyPart || ![self.currentHTTPBodyPart hasBytesAvailable]) {
+            if (!(self.currentHTTPBodyPart = [self.HTTPBodyPartEnumerator nextObject])) {
+                break;
+            }
+        } else {
+            NSUInteger maxLength = length - (NSUInteger)totalNumberOfBytesRead;
+            NSInteger numberOfBytesRead = [self.currentHTTPBodyPart read:&buffer[totalNumberOfBytesRead] maxLength:maxLength];
+            if (numberOfBytesRead == -1) {
+                self.streamError = self.currentHTTPBodyPart.inputStream.streamError;
+                break;
+            } else {
+                totalNumberOfBytesRead += numberOfBytesRead;
+
+                if (self.delay > 0.0f) {
+                    [NSThread sleepForTimeInterval:self.delay];
+                }
+            }
+        }
+    }
+#pragma clang diagnostic pop
+
+    return totalNumberOfBytesRead;
+}
+
+- (BOOL)getBuffer:(__unused uint8_t **)buffer
+           length:(__unused NSUInteger *)len
+{
+    return NO;
+}
+
+- (BOOL)hasBytesAvailable {
+    return [self streamStatus] == NSStreamStatusOpen;
+}
+
+#pragma mark - NSStream
+
+- (void)open {
+    if (self.streamStatus == NSStreamStatusOpen) {
+        return;
+    }
+
+    self.streamStatus = NSStreamStatusOpen;
+
+    [self setInitialAndFinalBoundaries];
+    self.HTTPBodyPartEnumerator = [self.HTTPBodyParts objectEnumerator];
+}
+
+- (void)close {
+    self.streamStatus = NSStreamStatusClosed;
+}
+
+- (id)propertyForKey:(__unused NSString *)key {
+    return nil;
+}
+
+- (BOOL)setProperty:(__unused id)property
+             forKey:(__unused NSString *)key
+{
+    return NO;
+}
+
+- (void)scheduleInRunLoop:(__unused NSRunLoop *)aRunLoop
+                  forMode:(__unused NSString *)mode
+{}
+
+- (void)removeFromRunLoop:(__unused NSRunLoop *)aRunLoop
+                  forMode:(__unused NSString *)mode
+{}
+
+- (unsigned long long)contentLength {
+    unsigned long long length = 0;
+    for (AFHTTPBodyPart *bodyPart in self.HTTPBodyParts) {
+        length += [bodyPart contentLength];
+    }
+
+    return length;
+}
+
+#pragma mark - Undocumented CFReadStream Bridged Methods
+
+- (void)_scheduleInCFRunLoop:(__unused CFRunLoopRef)aRunLoop
+                     forMode:(__unused CFStringRef)aMode
+{}
+
+- (void)_unscheduleFromCFRunLoop:(__unused CFRunLoopRef)aRunLoop
+                         forMode:(__unused CFStringRef)aMode
+{}
+
+- (BOOL)_setCFClientFlags:(__unused CFOptionFlags)inFlags
+                 callback:(__unused CFReadStreamClientCallBack)inCallback
+                  context:(__unused CFStreamClientContext *)inContext {
+    return NO;
+}
+
+#pragma mark - NSCopying
+
+-(id)copyWithZone:(NSZone *)zone {
+    AFMultipartBodyStream *bodyStreamCopy = [[[self class] allocWithZone:zone] initWithStringEncoding:self.stringEncoding];
+
+    for (AFHTTPBodyPart *bodyPart in self.HTTPBodyParts) {
+        [bodyStreamCopy appendHTTPBodyPart:[bodyPart copy]];
+    }
+
+    [bodyStreamCopy setInitialAndFinalBoundaries];
+
+    return bodyStreamCopy;
+}
+
+@end
+
+#pragma mark -
+
+typedef enum {
+    AFEncapsulationBoundaryPhase = 1,
+    AFHeaderPhase                = 2,
+    AFBodyPhase                  = 3,
+    AFFinalBoundaryPhase         = 4,
+} AFHTTPBodyPartReadPhase;
+
+@interface AFHTTPBodyPart () <NSCopying> {
+    AFHTTPBodyPartReadPhase _phase;
+    NSInputStream *_inputStream;
+    unsigned long long _phaseReadOffset;
+}
+
+- (BOOL)transitionToNextPhase;
+- (NSInteger)readData:(NSData *)data
+           intoBuffer:(uint8_t *)buffer
+            maxLength:(NSUInteger)length;
+@end
+
+@implementation AFHTTPBodyPart
+
+- (id)init {
+    self = [super init];
+    if (!self) {
+        return nil;
+    }
+
+    [self transitionToNextPhase];
+
+    return self;
+}
+
+- (void)dealloc {
+    if (_inputStream) {
+        [_inputStream close];
+        _inputStream = nil;
+    }
+}
+
+- (NSInputStream *)inputStream {
+    if (!_inputStream) {
+        if ([self.body isKindOfClass:[NSData class]]) {
+            _inputStream = [NSInputStream inputStreamWithData:self.body];
+        } else if ([self.body isKindOfClass:[NSURL class]]) {
+            _inputStream = [NSInputStream inputStreamWithURL:self.body];
+        } else if ([self.body isKindOfClass:[NSInputStream class]]) {
+            _inputStream = self.body;
+        } else {
+            _inputStream = [NSInputStream inputStreamWithData:[NSData data]];
+        }
+    }
+
+    return _inputStream;
+}
+
+- (NSString *)stringForHeaders {
+    NSMutableString *headerString = [NSMutableString string];
+    for (NSString *field in [self.headers allKeys]) {
+        [headerString appendString:[NSString stringWithFormat:@"%@: %@%@", field, [self.headers valueForKey:field], kAFMultipartFormCRLF]];
+    }
+    [headerString appendString:kAFMultipartFormCRLF];
+
+    return [NSString stringWithString:headerString];
+}
+
+- (unsigned long long)contentLength {
+    unsigned long long length = 0;
+
+    NSData *encapsulationBoundaryData = [([self hasInitialBoundary] ? AFMultipartFormInitialBoundary(self.boundary) : AFMultipartFormEncapsulationBoundary(self.boundary)) dataUsingEncoding:self.stringEncoding];
+    length += [encapsulationBoundaryData length];
+
+    NSData *headersData = [[self stringForHeaders] dataUsingEncoding:self.stringEncoding];
+    length += [headersData length];
+
+    length += _bodyContentLength;
+
+    NSData *closingBoundaryData = ([self hasFinalBoundary] ? [AFMultipartFormFinalBoundary(self.boundary) dataUsingEncoding:self.stringEncoding] : [NSData data]);
+    length += [closingBoundaryData length];
+
+    return length;
+}
+
+- (BOOL)hasBytesAvailable {
+    // Allows `read:maxLength:` to be called again if `AFMultipartFormFinalBoundary` doesn't fit into the available buffer
+    if (_phase == AFFinalBoundaryPhase) {
+        return YES;
+    }
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wcovered-switch-default"
+    switch (self.inputStream.streamStatus) {
+        case NSStreamStatusNotOpen:
+        case NSStreamStatusOpening:
+        case NSStreamStatusOpen:
+        case NSStreamStatusReading:
+        case NSStreamStatusWriting:
+            return YES;
+        case NSStreamStatusAtEnd:
+        case NSStreamStatusClosed:
+        case NSStreamStatusError:
+        default:
+            return NO;
+    }
+#pragma clang diagnostic pop
+}
+
+- (NSInteger)read:(uint8_t *)buffer
+        maxLength:(NSUInteger)length
+{
+    NSInteger totalNumberOfBytesRead = 0;
+
+    if (_phase == AFEncapsulationBoundaryPhase) {
+        NSData *encapsulationBoundaryData = [([self hasInitialBoundary] ? AFMultipartFormInitialBoundary(self.boundary) : AFMultipartFormEncapsulationBoundary(self.boundary)) dataUsingEncoding:self.stringEncoding];
+        totalNumberOfBytesRead += [self readData:encapsulationBoundaryData intoBuffer:&buffer[totalNumberOfBytesRead] maxLength:(length - (NSUInteger)totalNumberOfBytesRead)];
+    }
+
+    if (_phase == AFHeaderPhase) {
+        NSData *headersData = [[self stringForHeaders] dataUsingEncoding:self.stringEncoding];
+        totalNumberOfBytesRead += [self readData:headersData intoBuffer:&buffer[totalNumberOfBytesRead] maxLength:(length - (NSUInteger)totalNumberOfBytesRead)];
+    }
+
+    if (_phase == AFBodyPhase) {
+        NSInteger numberOfBytesRead = 0;
+
+        numberOfBytesRead = [self.inputStream read:&buffer[totalNumberOfBytesRead] maxLength:(length - (NSUInteger)totalNumberOfBytesRead)];
+        if (numberOfBytesRead == -1) {
+            return -1;
+        } else {
+            totalNumberOfBytesRead += numberOfBytesRead;
+
+            if ([self.inputStream streamStatus] >= NSStreamStatusAtEnd) {
+                [self transitionToNextPhase];
+            }
+        }
+    }
+
+    if (_phase == AFFinalBoundaryPhase) {
+        NSData *closingBoundaryData = ([self hasFinalBoundary] ? [AFMultipartFormFinalBoundary(self.boundary) dataUsingEncoding:self.stringEncoding] : [NSData data]);
+        totalNumberOfBytesRead += [self readData:closingBoundaryData intoBuffer:&buffer[totalNumberOfBytesRead] maxLength:(length - (NSUInteger)totalNumberOfBytesRead)];
+    }
+
+    return totalNumberOfBytesRead;
+}
+
+- (NSInteger)readData:(NSData *)data
+           intoBuffer:(uint8_t *)buffer
+            maxLength:(NSUInteger)length
+{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu"
+    NSRange range = NSMakeRange((NSUInteger)_phaseReadOffset, MIN([data length] - ((NSUInteger)_phaseReadOffset), length));
+    [data getBytes:buffer range:range];
+#pragma clang diagnostic pop
+
+    _phaseReadOffset += range.length;
+
+    if (((NSUInteger)_phaseReadOffset) >= [data length]) {
+        [self transitionToNextPhase];
+    }
+
+    return (NSInteger)range.length;
+}
+
+- (BOOL)transitionToNextPhase {
+    if (![[NSThread currentThread] isMainThread]) {
+        dispatch_sync(dispatch_get_main_queue(), ^{
+            [self transitionToNextPhase];
+        });
+        return YES;
+    }
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wcovered-switch-default"
+    switch (_phase) {
+        case AFEncapsulationBoundaryPhase:
+            _phase = AFHeaderPhase;
+            break;
+        case AFHeaderPhase:
+            [self.inputStream scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSRunLoopCommonModes];
+            [self.inputStream open];
+            _phase = AFBodyPhase;
+            break;
+        case AFBodyPhase:
+            [self.inputStream close];
+            _phase = AFFinalBoundaryPhase;
+            break;
+        case AFFinalBoundaryPhase:
+        default:
+            _phase = AFEncapsulationBoundaryPhase;
+            break;
+    }
+    _phaseReadOffset = 0;
+#pragma clang diagnostic pop
+
+    return YES;
+}
+
+#pragma mark - NSCopying
+
+- (id)copyWithZone:(NSZone *)zone {
+    AFHTTPBodyPart *bodyPart = [[[self class] allocWithZone:zone] init];
+    
+    bodyPart.stringEncoding = self.stringEncoding;
+    bodyPart.headers = self.headers;
+    bodyPart.bodyContentLength = self.bodyContentLength;
+    bodyPart.body = self.body;
+    bodyPart.boundary = self.boundary;
+    
+    return bodyPart;
+}
+
+@end
+
+#pragma mark -
+
+@implementation AFJSONRequestSerializer
+
++ (instancetype)serializer {
+    return [self serializerWithWritingOptions:(NSJSONWritingOptions)0];
+}
+
++ (instancetype)serializerWithWritingOptions:(NSJSONWritingOptions)writingOptions
+{
+    AFJSONRequestSerializer *serializer = [[self alloc] init];
+    serializer.writingOptions = writingOptions;
+
+    return serializer;
+}
+
+#pragma mark - AFURLRequestSerialization
+
+- (NSURLRequest *)requestBySerializingRequest:(NSURLRequest *)request
+                               withParameters:(id)parameters
+                                        error:(NSError *__autoreleasing *)error
+{
+    NSParameterAssert(request);
+
+    if ([self.HTTPMethodsEncodingParametersInURI containsObject:[[request HTTPMethod] uppercaseString]]) {
+        return [super requestBySerializingRequest:request withParameters:parameters error:error];
+    }
+
+    NSMutableURLRequest *mutableRequest = [request mutableCopy];
+
+    [self.HTTPRequestHeaders enumerateKeysAndObjectsUsingBlock:^(id field, id value, BOOL * __unused stop) {
+        if (![request valueForHTTPHeaderField:field]) {
+            [mutableRequest setValue:value forHTTPHeaderField:field];
+        }
+    }];
+    
+    if (parameters) {
+        if (![mutableRequest valueForHTTPHeaderField:@"Content-Type"]) {
+            [mutableRequest setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
+        }
+
+        [mutableRequest setHTTPBody:[NSJSONSerialization dataWithJSONObject:parameters options:self.writingOptions error:error]];
+    }
+
+    return mutableRequest;
+}
+
+#pragma mark - NSSecureCoding
+
+- (id)initWithCoder:(NSCoder *)decoder {
+    self = [super initWithCoder:decoder];
+    if (!self) {
+        return nil;
+    }
+
+    self.writingOptions = [[decoder decodeObjectOfClass:[NSNumber class] forKey:NSStringFromSelector(@selector(writingOptions))] unsignedIntegerValue];
+
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+    [super encodeWithCoder:coder];
+
+    [coder encodeInteger:self.writingOptions forKey:NSStringFromSelector(@selector(writingOptions))];
+}
+
+#pragma mark - NSCopying
+
+- (id)copyWithZone:(NSZone *)zone {
+    AFJSONRequestSerializer *serializer = [super copyWithZone:zone];
+    serializer.writingOptions = self.writingOptions;
+
+    return serializer;
+}
+
+@end
+
+#pragma mark -
+
+@implementation AFPropertyListRequestSerializer
+
++ (instancetype)serializer {
+    return [self serializerWithFormat:NSPropertyListXMLFormat_v1_0 writeOptions:0];
+}
+
++ (instancetype)serializerWithFormat:(NSPropertyListFormat)format
+                        writeOptions:(NSPropertyListWriteOptions)writeOptions
+{
+    AFPropertyListRequestSerializer *serializer = [[self alloc] init];
+    serializer.format = format;
+    serializer.writeOptions = writeOptions;
+
+    return serializer;
+}
+
+#pragma mark - AFURLRequestSerializer
+
+- (NSURLRequest *)requestBySerializingRequest:(NSURLRequest *)request
+                               withParameters:(id)parameters
+                                        error:(NSError *__autoreleasing *)error
+{
+    NSParameterAssert(request);
+
+    if ([self.HTTPMethodsEncodingParametersInURI containsObject:[[request HTTPMethod] uppercaseString]]) {
+        return [super requestBySerializingRequest:request withParameters:parameters error:error];
+    }
+
+    NSMutableURLRequest *mutableRequest = [request mutableCopy];
+
+    [self.HTTPRequestHeaders enumerateKeysAndObjectsUsingBlock:^(id field, id value, BOOL * __unused stop) {
+        if (![request valueForHTTPHeaderField:field]) {
+            [mutableRequest setValue:value forHTTPHeaderField:field];
+        }
+    }];
+
+    if (parameters) {
+        if (![mutableRequest valueForHTTPHeaderField:@"Content-Type"]) {
+            [mutableRequest setValue:@"application/x-plist" forHTTPHeaderField:@"Content-Type"];
+        }
+
+        [mutableRequest setHTTPBody:[NSPropertyListSerialization dataWithPropertyList:parameters format:self.format options:self.writeOptions error:error]];
+    }
+
+    return mutableRequest;
+}
+
+#pragma mark - NSSecureCoding
+
+- (id)initWithCoder:(NSCoder *)decoder {
+    self = [super initWithCoder:decoder];
+    if (!self) {
+        return nil;
+    }
+
+    self.format = [[decoder decodeObjectOfClass:[NSNumber class] forKey:NSStringFromSelector(@selector(format))] unsignedIntegerValue];
+    self.writeOptions = [[decoder decodeObjectOfClass:[NSNumber class] forKey:NSStringFromSelector(@selector(writeOptions))] unsignedIntegerValue];
+
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+    [super encodeWithCoder:coder];
+
+    [coder encodeInteger:self.format forKey:NSStringFromSelector(@selector(format))];
+    [coder encodeObject:@(self.writeOptions) forKey:NSStringFromSelector(@selector(writeOptions))];
+}
+
+#pragma mark - NSCopying
+
+- (id)copyWithZone:(NSZone *)zone {
+    AFPropertyListRequestSerializer *serializer = [super copyWithZone:zone];
+    serializer.format = self.format;
+    serializer.writeOptions = self.writeOptions;
+
+    return serializer;
+}
+
+@end
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLResponseSerialization.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLResponseSerialization.h
new file mode 100644
index 000000000..030e8faed
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLResponseSerialization.h
@@ -0,0 +1,310 @@
+// AFSerialization.h
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import <Foundation/Foundation.h>
+#import <CoreGraphics/CoreGraphics.h>
+
+/**
+ The `AFURLResponseSerialization` protocol is adopted by an object that decodes data into a more useful object representation, according to details in the server response. Response serializers may additionally perform validation on the incoming response and data.
+
+ For example, a JSON response serializer may check for an acceptable status code (`2XX` range) and content type (`application/json`), decoding a valid JSON response into an object.
+ */
+@protocol AFURLResponseSerialization <NSObject, NSSecureCoding, NSCopying>
+
+/**
+ The response object decoded from the data associated with a specified response.
+
+ @param response The response to be processed.
+ @param data The response data to be decoded.
+ @param error The error that occurred while attempting to decode the response data.
+
+ @return The object decoded from the specified response data.
+ */
+- (id)responseObjectForResponse:(NSURLResponse *)response
+                           data:(NSData *)data
+                          error:(NSError *__autoreleasing *)error;
+
+@end
+
+#pragma mark -
+
+/**
+ `AFHTTPResponseSerializer` conforms to the `AFURLRequestSerialization` & `AFURLResponseSerialization` protocols, offering a concrete base implementation of query string / URL form-encoded parameter serialization and default request headers, as well as response status code and content type validation.
+
+ Any request or response serializer dealing with HTTP is encouraged to subclass `AFHTTPResponseSerializer` in order to ensure consistent default behavior.
+ */
+@interface AFHTTPResponseSerializer : NSObject <AFURLResponseSerialization>
+
+- (instancetype) init;
+
+/**
+ The string encoding used to serialize parameters.
+ */
+@property (nonatomic, assign) NSStringEncoding stringEncoding;
+
+/**
+ Creates and returns a serializer with default configuration.
+ */
++ (instancetype)serializer;
+
+///-----------------------------------------
+/// @name Configuring Response Serialization
+///-----------------------------------------
+
+/**
+ The acceptable HTTP status codes for responses. When non-`nil`, responses with status codes not contained by the set will result in an error during validation.
+
+ See http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
+ */
+@property (nonatomic, copy) NSIndexSet *acceptableStatusCodes;
+
+/**
+ The acceptable MIME types for responses. When non-`nil`, responses with a `Content-Type` with MIME types that do not intersect with the set will result in an error during validation.
+ */
+@property (nonatomic, copy) NSSet *acceptableContentTypes;
+
+/**
+ Validates the specified response and data.
+
+ In its base implementation, this method checks for an acceptable status code and content type. Subclasses may wish to add other domain-specific checks.
+
+ @param response The response to be validated.
+ @param data The data associated with the response.
+ @param error The error that occurred while attempting to validate the response.
+
+ @return `YES` if the response is valid, otherwise `NO`.
+ */
+- (BOOL)validateResponse:(NSHTTPURLResponse *)response
+                    data:(NSData *)data
+                   error:(NSError *__autoreleasing *)error;
+
+@end
+
+#pragma mark -
+
+
+/**
+ `AFJSONResponseSerializer` is a subclass of `AFHTTPResponseSerializer` that validates and decodes JSON responses.
+
+ By default, `AFJSONResponseSerializer` accepts the following MIME types, which includes the official standard, `application/json`, as well as other commonly-used types:
+
+ - `application/json`
+ - `text/json`
+ - `text/javascript`
+ */
+@interface AFJSONResponseSerializer : AFHTTPResponseSerializer
+
+- (instancetype) init;
+
+/**
+ Options for reading the response JSON data and creating the Foundation objects. For possible values, see the `NSJSONSerialization` documentation section "NSJSONReadingOptions". `0` by default.
+ */
+@property (nonatomic, assign) NSJSONReadingOptions readingOptions;
+
+/**
+ Whether to remove keys with `NSNull` values from response JSON. Defaults to `NO`.
+ */
+@property (nonatomic, assign) BOOL removesKeysWithNullValues;
+
+/**
+ Creates and returns a JSON serializer with specified reading and writing options.
+
+ @param readingOptions The specified JSON reading options.
+ */
++ (instancetype)serializerWithReadingOptions:(NSJSONReadingOptions)readingOptions;
+
+@end
+
+#pragma mark -
+
+/**
+ `AFXMLParserResponseSerializer` is a subclass of `AFHTTPResponseSerializer` that validates and decodes XML responses as an `NSXMLParser` objects.
+
+ By default, `AFXMLParserResponseSerializer` accepts the following MIME types, which includes the official standard, `application/xml`, as well as other commonly-used types:
+
+ - `application/xml`
+ - `text/xml`
+ */
+@interface AFXMLParserResponseSerializer : AFHTTPResponseSerializer
+
+@end
+
+#pragma mark -
+
+#ifdef __MAC_OS_X_VERSION_MIN_REQUIRED
+
+/**
+ `AFXMLDocumentResponseSerializer` is a subclass of `AFHTTPResponseSerializer` that validates and decodes XML responses as an `NSXMLDocument` objects.
+
+ By default, `AFXMLDocumentResponseSerializer` accepts the following MIME types, which includes the official standard, `application/xml`, as well as other commonly-used types:
+
+ - `application/xml`
+ - `text/xml`
+ */
+@interface AFXMLDocumentResponseSerializer : AFHTTPResponseSerializer
+
+- (instancetype) init;
+
+/**
+ Input and output options specifically intended for `NSXMLDocument` objects. For possible values, see the `NSJSONSerialization` documentation section "NSJSONReadingOptions". `0` by default.
+ */
+@property (nonatomic, assign) NSUInteger options;
+
+/**
+ Creates and returns an XML document serializer with the specified options.
+
+ @param mask The XML document options.
+ */
++ (instancetype)serializerWithXMLDocumentOptions:(NSUInteger)mask;
+
+@end
+
+#endif
+
+#pragma mark -
+
+/**
+ `AFPropertyListResponseSerializer` is a subclass of `AFHTTPResponseSerializer` that validates and decodes XML responses as an `NSXMLDocument` objects.
+
+ By default, `AFPropertyListResponseSerializer` accepts the following MIME types:
+
+ - `application/x-plist`
+ */
+@interface AFPropertyListResponseSerializer : AFHTTPResponseSerializer
+
+- (instancetype) init;
+
+/**
+ The property list format. Possible values are described in "NSPropertyListFormat".
+ */
+@property (nonatomic, assign) NSPropertyListFormat format;
+
+/**
+ The property list reading options. Possible values are described in "NSPropertyListMutabilityOptions."
+ */
+@property (nonatomic, assign) NSPropertyListReadOptions readOptions;
+
+/**
+ Creates and returns a property list serializer with a specified format, read options, and write options.
+
+ @param format The property list format.
+ @param readOptions The property list reading options.
+ */
++ (instancetype)serializerWithFormat:(NSPropertyListFormat)format
+                         readOptions:(NSPropertyListReadOptions)readOptions;
+
+@end
+
+#pragma mark -
+
+/**
+ `AFImageResponseSerializer` is a subclass of `AFHTTPResponseSerializer` that validates and decodes image responses.
+
+ By default, `AFImageResponseSerializer` accepts the following MIME types, which correspond to the image formats supported by UIImage or NSImage:
+
+ - `image/tiff`
+ - `image/jpeg`
+ - `image/gif`
+ - `image/png`
+ - `image/ico`
+ - `image/x-icon`
+ - `image/bmp`
+ - `image/x-bmp`
+ - `image/x-xbitmap`
+ - `image/x-win-bitmap`
+ */
+@interface AFImageResponseSerializer : AFHTTPResponseSerializer
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+/**
+ The scale factor used when interpreting the image data to construct `responseImage`. Specifying a scale factor of 1.0 results in an image whose size matches the pixel-based dimensions of the image. Applying a different scale factor changes the size of the image as reported by the size property. This is set to the value of scale of the main screen by default, which automatically scales images for retina displays, for instance.
+ */
+@property (nonatomic, assign) CGFloat imageScale;
+
+/**
+ Whether to automatically inflate response image data for compressed formats (such as PNG or JPEG). Enabling this can significantly improve drawing performance on iOS when used with `setCompletionBlockWithSuccess:failure:`, as it allows a bitmap representation to be constructed in the background rather than on the main thread. `YES` by default.
+ */
+@property (nonatomic, assign) BOOL automaticallyInflatesResponseImage;
+#endif
+
+@end
+
+#pragma mark -
+
+/**
+ `AFCompoundSerializer` is a subclass of `AFHTTPResponseSerializer` that delegates the response serialization to the first `AFHTTPResponseSerializer` object that returns an object for `responseObjectForResponse:data:error:`, falling back on the default behavior of `AFHTTPResponseSerializer`. This is useful for supporting multiple potential types and structures of server responses with a single serializer.
+ */
+@interface AFCompoundResponseSerializer : AFHTTPResponseSerializer
+
+/**
+ The component response serializers.
+ */
+@property (readonly, nonatomic, copy) NSArray *responseSerializers;
+
+/**
+ Creates and returns a compound serializer comprised of the specified response serializers.
+
+ @warning Each response serializer specified must be a subclass of `AFHTTPResponseSerializer`, and response to `-validateResponse:data:error:`.
+ */
++ (instancetype)compoundSerializerWithResponseSerializers:(NSArray *)responseSerializers;
+
+@end
+
+///----------------
+/// @name Constants
+///----------------
+
+/**
+ ## Error Domains
+
+ The following error domain is predefined.
+
+ - `NSString * const AFURLResponseSerializationErrorDomain`
+
+ ### Constants
+
+ `AFURLResponseSerializationErrorDomain`
+ AFURLResponseSerializer errors. Error codes for `AFURLResponseSerializationErrorDomain` correspond to codes in `NSURLErrorDomain`.
+ */
+extern NSString * const AFURLResponseSerializationErrorDomain;
+
+/**
+ ## User info dictionary keys
+
+ These keys may exist in the user info dictionary, in addition to those defined for NSError.
+
+ - `NSString * const AFNetworkingOperationFailingURLResponseErrorKey`
+ - `NSString * const AFNetworkingOperationFailingURLResponseDataErrorKey`
+
+ ### Constants
+
+ `AFNetworkingOperationFailingURLResponseErrorKey`
+ The corresponding value is an `NSURLResponse` containing the response of the operation associated with an error. This key is only present in the `AFURLResponseSerializationErrorDomain`.
+ 
+ `AFNetworkingOperationFailingURLResponseDataErrorKey`
+ The corresponding value is an `NSData` containing the original data of the operation associated with an error. This key is only present in the `AFURLResponseSerializationErrorDomain`.
+ */
+extern NSString * const AFNetworkingOperationFailingURLResponseErrorKey;
+
+extern NSString * const AFNetworkingOperationFailingURLResponseDataErrorKey;
+
+
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLResponseSerialization.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLResponseSerialization.m
new file mode 100644
index 000000000..083d30c26
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLResponseSerialization.m
@@ -0,0 +1,793 @@
+// AFSerialization.h
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import "AFURLResponseSerialization.h"
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+#import <UIKit/UIKit.h>
+#elif defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
+#import <Cocoa/Cocoa.h>
+#endif
+
+NSString * const AFURLResponseSerializationErrorDomain = @"com.alamofire.error.serialization.response";
+NSString * const AFNetworkingOperationFailingURLResponseErrorKey = @"com.alamofire.serialization.response.error.response";
+NSString * const AFNetworkingOperationFailingURLResponseDataErrorKey = @"com.alamofire.serialization.response.error.data";
+
+static NSError * AFErrorWithUnderlyingError(NSError *error, NSError *underlyingError) {
+    if (!error) {
+        return underlyingError;
+    }
+
+    if (!underlyingError || error.userInfo[NSUnderlyingErrorKey]) {
+        return error;
+    }
+
+    NSMutableDictionary *mutableUserInfo = [error.userInfo mutableCopy];
+    mutableUserInfo[NSUnderlyingErrorKey] = underlyingError;
+
+    return [[NSError alloc] initWithDomain:error.domain code:error.code userInfo:mutableUserInfo];
+}
+
+static BOOL AFErrorOrUnderlyingErrorHasCodeInDomain(NSError *error, NSInteger code, NSString *domain) {
+    if ([error.domain isEqualToString:domain] && error.code == code) {
+        return YES;
+    } else if (error.userInfo[NSUnderlyingErrorKey]) {
+        return AFErrorOrUnderlyingErrorHasCodeInDomain(error.userInfo[NSUnderlyingErrorKey], code, domain);
+    }
+
+    return NO;
+}
+
+static id AFJSONObjectByRemovingKeysWithNullValues(id JSONObject, NSJSONReadingOptions readingOptions) {
+    if ([JSONObject isKindOfClass:[NSArray class]]) {
+        NSMutableArray *mutableArray = [NSMutableArray arrayWithCapacity:[(NSArray *)JSONObject count]];
+        for (id value in (NSArray *)JSONObject) {
+            [mutableArray addObject:AFJSONObjectByRemovingKeysWithNullValues(value, readingOptions)];
+        }
+
+        return (readingOptions & NSJSONReadingMutableContainers) ? mutableArray : [NSArray arrayWithArray:mutableArray];
+    } else if ([JSONObject isKindOfClass:[NSDictionary class]]) {
+        NSMutableDictionary *mutableDictionary = [NSMutableDictionary dictionaryWithDictionary:JSONObject];
+        for (id <NSCopying> key in [(NSDictionary *)JSONObject allKeys]) {
+            id value = [(NSDictionary *)JSONObject objectForKey:key];
+            if (!value || [value isEqual:[NSNull null]]) {
+                [mutableDictionary removeObjectForKey:key];
+            } else if ([value isKindOfClass:[NSArray class]] || [value isKindOfClass:[NSDictionary class]]) {
+                [mutableDictionary setObject:AFJSONObjectByRemovingKeysWithNullValues(value, readingOptions) forKey:key];
+            }
+        }
+
+        return (readingOptions & NSJSONReadingMutableContainers) ? mutableDictionary : [NSDictionary dictionaryWithDictionary:mutableDictionary];
+    }
+
+    return JSONObject;
+}
+
+@implementation AFHTTPResponseSerializer
+
++ (instancetype)serializer {
+    return [[self alloc] init];
+}
+
+- (instancetype)init {
+    self = [super init];
+    if (!self) {
+        return nil;
+    }
+
+    self.stringEncoding = NSUTF8StringEncoding;
+
+    self.acceptableStatusCodes = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(200, 100)];
+    self.acceptableContentTypes = nil;
+
+    return self;
+}
+
+#pragma mark -
+
+- (BOOL)validateResponse:(NSHTTPURLResponse *)response
+                    data:(NSData *)data
+                   error:(NSError * __autoreleasing *)error
+{
+    BOOL responseIsValid = YES;
+    NSError *validationError = nil;
+
+    if (response && [response isKindOfClass:[NSHTTPURLResponse class]]) {
+        if (self.acceptableContentTypes && ![self.acceptableContentTypes containsObject:[response MIMEType]]) {
+            if ([data length] > 0 && [response URL]) {
+                NSMutableDictionary *mutableUserInfo = [@{
+                                                          NSLocalizedDescriptionKey: [NSString stringWithFormat:NSLocalizedStringFromTable(@"Request failed: unacceptable content-type: %@", @"AFNetworking", nil), [response MIMEType]],
+                                                          NSURLErrorFailingURLErrorKey:[response URL],
+                                                          AFNetworkingOperationFailingURLResponseErrorKey: response,
+                                                        } mutableCopy];
+                if (data) {
+                    mutableUserInfo[AFNetworkingOperationFailingURLResponseDataErrorKey] = data;
+                }
+
+                validationError = AFErrorWithUnderlyingError([NSError errorWithDomain:AFURLResponseSerializationErrorDomain code:NSURLErrorCannotDecodeContentData userInfo:mutableUserInfo], validationError);
+            }
+
+            responseIsValid = NO;
+        }
+
+        if (self.acceptableStatusCodes && ![self.acceptableStatusCodes containsIndex:(NSUInteger)response.statusCode] && [response URL]) {
+            NSMutableDictionary *mutableUserInfo = [@{
+                                               NSLocalizedDescriptionKey: [NSString stringWithFormat:NSLocalizedStringFromTable(@"Request failed: %@ (%ld)", @"AFNetworking", nil), [NSHTTPURLResponse localizedStringForStatusCode:response.statusCode], (long)response.statusCode],
+                                               NSURLErrorFailingURLErrorKey:[response URL],
+                                               AFNetworkingOperationFailingURLResponseErrorKey: response,
+                                       } mutableCopy];
+
+            if (data) {
+                mutableUserInfo[AFNetworkingOperationFailingURLResponseDataErrorKey] = data;
+            }
+
+            validationError = AFErrorWithUnderlyingError([NSError errorWithDomain:AFURLResponseSerializationErrorDomain code:NSURLErrorBadServerResponse userInfo:mutableUserInfo], validationError);
+
+            responseIsValid = NO;
+        }
+    }
+
+    if (error && !responseIsValid) {
+        *error = validationError;
+    }
+
+    return responseIsValid;
+}
+
+#pragma mark - AFURLResponseSerialization
+
+- (id)responseObjectForResponse:(NSURLResponse *)response
+                           data:(NSData *)data
+                          error:(NSError *__autoreleasing *)error
+{
+    [self validateResponse:(NSHTTPURLResponse *)response data:data error:error];
+
+    return data;
+}
+
+#pragma mark - NSSecureCoding
+
++ (BOOL)supportsSecureCoding {
+    return YES;
+}
+
+- (id)initWithCoder:(NSCoder *)decoder {
+    self = [self init];
+    if (!self) {
+        return nil;
+    }
+
+    self.acceptableStatusCodes = [decoder decodeObjectOfClass:[NSIndexSet class] forKey:NSStringFromSelector(@selector(acceptableStatusCodes))];
+    self.acceptableContentTypes = [decoder decodeObjectOfClass:[NSIndexSet class] forKey:NSStringFromSelector(@selector(acceptableContentTypes))];
+
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+    [coder encodeObject:self.acceptableStatusCodes forKey:NSStringFromSelector(@selector(acceptableStatusCodes))];
+    [coder encodeObject:self.acceptableContentTypes forKey:NSStringFromSelector(@selector(acceptableContentTypes))];
+}
+
+#pragma mark - NSCopying
+
+- (id)copyWithZone:(NSZone *)zone {
+    AFHTTPResponseSerializer *serializer = [[[self class] allocWithZone:zone] init];
+    serializer.acceptableStatusCodes = [self.acceptableStatusCodes copyWithZone:zone];
+    serializer.acceptableContentTypes = [self.acceptableContentTypes copyWithZone:zone];
+
+    return serializer;
+}
+
+@end
+
+#pragma mark -
+
+@implementation AFJSONResponseSerializer
+
++ (instancetype)serializer {
+    return [self serializerWithReadingOptions:(NSJSONReadingOptions)0];
+}
+
++ (instancetype)serializerWithReadingOptions:(NSJSONReadingOptions)readingOptions {
+    AFJSONResponseSerializer *serializer = [[self alloc] init];
+    serializer.readingOptions = readingOptions;
+
+    return serializer;
+}
+
+- (instancetype)init {
+    self = [super init];
+    if (!self) {
+        return nil;
+    }
+
+    self.acceptableContentTypes = [NSSet setWithObjects:@"application/json", @"text/json", @"text/javascript", nil];
+
+    return self;
+}
+
+#pragma mark - AFURLResponseSerialization
+
+- (id)responseObjectForResponse:(NSURLResponse *)response
+                           data:(NSData *)data
+                          error:(NSError *__autoreleasing *)error
+{
+    if (![self validateResponse:(NSHTTPURLResponse *)response data:data error:error]) {
+        if (!error || AFErrorOrUnderlyingErrorHasCodeInDomain(*error, NSURLErrorCannotDecodeContentData, AFURLResponseSerializationErrorDomain)) {
+            return nil;
+        }
+    }
+
+    // Workaround for behavior of Rails to return a single space for `head :ok` (a workaround for a bug in Safari), which is not interpreted as valid input by NSJSONSerialization.
+    // See https://github.com/rails/rails/issues/1742
+    NSStringEncoding stringEncoding = self.stringEncoding;
+    if (response.textEncodingName) {
+        CFStringEncoding encoding = CFStringConvertIANACharSetNameToEncoding((CFStringRef)response.textEncodingName);
+        if (encoding != kCFStringEncodingInvalidId) {
+            stringEncoding = CFStringConvertEncodingToNSStringEncoding(encoding);
+        }
+    }
+
+    id responseObject = nil;
+    NSError *serializationError = nil;
+    @autoreleasepool {
+        NSString *responseString = [[NSString alloc] initWithData:data encoding:stringEncoding];
+        if (responseString && ![responseString isEqualToString:@" "]) {
+            // Workaround for a bug in NSJSONSerialization when Unicode character escape codes are used instead of the actual character
+            // See http://stackoverflow.com/a/12843465/157142
+            data = [responseString dataUsingEncoding:NSUTF8StringEncoding];
+
+            if (data) {
+                if ([data length] > 0) {
+                    responseObject = [NSJSONSerialization JSONObjectWithData:data options:self.readingOptions error:&serializationError];
+                } else {
+                    return nil;
+                }
+            } else {
+                NSDictionary *userInfo = @{
+                                           NSLocalizedDescriptionKey: NSLocalizedStringFromTable(@"Data failed decoding as a UTF-8 string", @"AFNetworking", nil),
+                                           NSLocalizedFailureReasonErrorKey: [NSString stringWithFormat:NSLocalizedStringFromTable(@"Could not decode string: %@", @"AFNetworking", nil), responseString]
+                                           };
+
+                serializationError = [NSError errorWithDomain:AFURLResponseSerializationErrorDomain code:NSURLErrorCannotDecodeContentData userInfo:userInfo];
+            }
+        }
+    }
+
+    if (self.removesKeysWithNullValues && responseObject) {
+        responseObject = AFJSONObjectByRemovingKeysWithNullValues(responseObject, self.readingOptions);
+    }
+    
+    if (error) {
+        *error = AFErrorWithUnderlyingError(serializationError, *error);
+    }
+    
+    return responseObject;
+}
+
+#pragma mark - NSSecureCoding
+
+- (id)initWithCoder:(NSCoder *)decoder {
+    self = [super initWithCoder:decoder];
+    if (!self) {
+        return nil;
+    }
+
+    self.readingOptions = [[decoder decodeObjectOfClass:[NSNumber class] forKey:NSStringFromSelector(@selector(readingOptions))] unsignedIntegerValue];
+    self.removesKeysWithNullValues = [[decoder decodeObjectOfClass:[NSNumber class] forKey:NSStringFromSelector(@selector(removesKeysWithNullValues))] boolValue];
+
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+    [super encodeWithCoder:coder];
+
+    [coder encodeObject:@(self.readingOptions) forKey:NSStringFromSelector(@selector(readingOptions))];
+    [coder encodeObject:@(self.removesKeysWithNullValues) forKey:NSStringFromSelector(@selector(removesKeysWithNullValues))];
+}
+
+#pragma mark - NSCopying
+
+- (id)copyWithZone:(NSZone *)zone {
+    AFJSONResponseSerializer *serializer = [[[self class] allocWithZone:zone] init];
+    serializer.readingOptions = self.readingOptions;
+    serializer.removesKeysWithNullValues = self.removesKeysWithNullValues;
+
+    return serializer;
+}
+
+@end
+
+#pragma mark -
+
+@implementation AFXMLParserResponseSerializer
+
++ (instancetype)serializer {
+    AFXMLParserResponseSerializer *serializer = [[self alloc] init];
+
+    return serializer;
+}
+
+- (instancetype)init {
+    self = [super init];
+    if (!self) {
+        return nil;
+    }
+
+    self.acceptableContentTypes = [[NSSet alloc] initWithObjects:@"application/xml", @"text/xml", nil];
+
+    return self;
+}
+
+#pragma mark - AFURLResponseSerialization
+
+- (id)responseObjectForResponse:(NSHTTPURLResponse *)response
+                           data:(NSData *)data
+                          error:(NSError *__autoreleasing *)error
+{
+    if (![self validateResponse:(NSHTTPURLResponse *)response data:data error:error]) {
+        if (!error || AFErrorOrUnderlyingErrorHasCodeInDomain(*error, NSURLErrorCannotDecodeContentData, AFURLResponseSerializationErrorDomain)) {
+            return nil;
+        }
+    }
+
+    return [[NSXMLParser alloc] initWithData:data];
+}
+
+@end
+
+#pragma mark -
+
+#ifdef __MAC_OS_X_VERSION_MIN_REQUIRED
+
+@implementation AFXMLDocumentResponseSerializer
+
++ (instancetype)serializer {
+    return [self serializerWithXMLDocumentOptions:0];
+}
+
++ (instancetype)serializerWithXMLDocumentOptions:(NSUInteger)mask {
+    AFXMLDocumentResponseSerializer *serializer = [[self alloc] init];
+    serializer.options = mask;
+
+    return serializer;
+}
+
+- (instancetype)init {
+    self = [super init];
+    if (!self) {
+        return nil;
+    }
+
+    self.acceptableContentTypes = [[NSSet alloc] initWithObjects:@"application/xml", @"text/xml", nil];
+
+    return self;
+}
+
+#pragma mark - AFURLResponseSerialization
+
+- (id)responseObjectForResponse:(NSURLResponse *)response
+                           data:(NSData *)data
+                          error:(NSError *__autoreleasing *)error
+{
+    if (![self validateResponse:(NSHTTPURLResponse *)response data:data error:error]) {
+        if (!error || AFErrorOrUnderlyingErrorHasCodeInDomain(*error, NSURLErrorCannotDecodeContentData, AFURLResponseSerializationErrorDomain)) {
+            return nil;
+        }
+    }
+
+    NSError *serializationError = nil;
+    NSXMLDocument *document = [[NSXMLDocument alloc] initWithData:data options:self.options error:&serializationError];
+
+    if (error) {
+        *error = AFErrorWithUnderlyingError(serializationError, *error);
+    }
+
+    return document;
+}
+
+#pragma mark - NSSecureCoding
+
+- (id)initWithCoder:(NSCoder *)decoder {
+    self = [super initWithCoder:decoder];
+    if (!self) {
+        return nil;
+    }
+
+    self.options = [[decoder decodeObjectOfClass:[NSNumber class] forKey:NSStringFromSelector(@selector(options))] unsignedIntegerValue];
+
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+    [super encodeWithCoder:coder];
+
+    [coder encodeObject:@(self.options) forKey:NSStringFromSelector(@selector(options))];
+}
+
+#pragma mark - NSCopying
+
+- (id)copyWithZone:(NSZone *)zone {
+    AFXMLDocumentResponseSerializer *serializer = [[[self class] allocWithZone:zone] init];
+    serializer.options = self.options;
+
+    return serializer;
+}
+
+@end
+
+#endif
+
+#pragma mark -
+
+@implementation AFPropertyListResponseSerializer
+
++ (instancetype)serializer {
+    return [self serializerWithFormat:NSPropertyListXMLFormat_v1_0 readOptions:0];
+}
+
++ (instancetype)serializerWithFormat:(NSPropertyListFormat)format
+                         readOptions:(NSPropertyListReadOptions)readOptions
+{
+    AFPropertyListResponseSerializer *serializer = [[self alloc] init];
+    serializer.format = format;
+    serializer.readOptions = readOptions;
+
+    return serializer;
+}
+
+- (instancetype)init {
+    self = [super init];
+    if (!self) {
+        return nil;
+    }
+
+    self.acceptableContentTypes = [[NSSet alloc] initWithObjects:@"application/x-plist", nil];
+
+    return self;
+}
+
+#pragma mark - AFURLResponseSerialization
+
+- (id)responseObjectForResponse:(NSURLResponse *)response
+                           data:(NSData *)data
+                          error:(NSError *__autoreleasing *)error
+{
+    if (![self validateResponse:(NSHTTPURLResponse *)response data:data error:error]) {
+        if (!error || AFErrorOrUnderlyingErrorHasCodeInDomain(*error, NSURLErrorCannotDecodeContentData, AFURLResponseSerializationErrorDomain)) {
+            return nil;
+        }
+    }
+
+    id responseObject;
+    NSError *serializationError = nil;
+
+    if (data) {
+        responseObject = [NSPropertyListSerialization propertyListWithData:data options:self.readOptions format:NULL error:&serializationError];
+    }
+
+    if (error) {
+        *error = AFErrorWithUnderlyingError(serializationError, *error);
+    }
+
+    return responseObject;
+}
+
+#pragma mark - NSSecureCoding
+
+- (id)initWithCoder:(NSCoder *)decoder {
+    self = [super initWithCoder:decoder];
+    if (!self) {
+        return nil;
+    }
+
+    self.format = [[decoder decodeObjectOfClass:[NSNumber class] forKey:NSStringFromSelector(@selector(format))] unsignedIntegerValue];
+    self.readOptions = [[decoder decodeObjectOfClass:[NSNumber class] forKey:NSStringFromSelector(@selector(readOptions))] unsignedIntegerValue];
+
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+    [super encodeWithCoder:coder];
+
+    [coder encodeObject:@(self.format) forKey:NSStringFromSelector(@selector(format))];
+    [coder encodeObject:@(self.readOptions) forKey:NSStringFromSelector(@selector(readOptions))];
+}
+
+#pragma mark - NSCopying
+
+- (id)copyWithZone:(NSZone *)zone {
+    AFPropertyListResponseSerializer *serializer = [[[self class] allocWithZone:zone] init];
+    serializer.format = self.format;
+    serializer.readOptions = self.readOptions;
+
+    return serializer;
+}
+
+@end
+
+#pragma mark -
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+#import <CoreGraphics/CoreGraphics.h>
+
+static UIImage * AFImageWithDataAtScale(NSData *data, CGFloat scale) {
+    UIImage *image = [[UIImage alloc] initWithData:data];
+
+    return [[UIImage alloc] initWithCGImage:[image CGImage] scale:scale orientation:image.imageOrientation];
+}
+
+static UIImage * AFInflatedImageFromResponseWithDataAtScale(NSHTTPURLResponse *response, NSData *data, CGFloat scale) {
+    if (!data || [data length] == 0) {
+        return nil;
+    }
+
+    CGImageRef imageRef = NULL;
+    CGDataProviderRef dataProvider = CGDataProviderCreateWithCFData((__bridge CFDataRef)data);
+
+    if ([response.MIMEType isEqualToString:@"image/png"]) {
+        imageRef = CGImageCreateWithPNGDataProvider(dataProvider,  NULL, true, kCGRenderingIntentDefault);
+    } else if ([response.MIMEType isEqualToString:@"image/jpeg"]) {
+        imageRef = CGImageCreateWithJPEGDataProvider(dataProvider, NULL, true, kCGRenderingIntentDefault);
+
+        // CGImageCreateWithJPEGDataProvider does not properly handle CMKY, so if so, fall back to AFImageWithDataAtScale
+        if (imageRef) {
+            CGColorSpaceRef imageColorSpace = CGImageGetColorSpace(imageRef);
+            CGColorSpaceModel imageColorSpaceModel = CGColorSpaceGetModel(imageColorSpace);
+            if (imageColorSpaceModel == kCGColorSpaceModelCMYK) {
+                CGImageRelease(imageRef);
+                imageRef = NULL;
+            }
+        }
+    }
+
+    CGDataProviderRelease(dataProvider);
+
+    UIImage *image = AFImageWithDataAtScale(data, scale);
+    if (!imageRef) {
+        if (image.images || !image) {
+            return image;
+        }
+
+        imageRef = CGImageCreateCopy([image CGImage]);
+        if (!imageRef) {
+            return nil;
+        }
+    }
+
+    size_t width = CGImageGetWidth(imageRef);
+    size_t height = CGImageGetHeight(imageRef);
+    size_t bitsPerComponent = CGImageGetBitsPerComponent(imageRef);
+
+    if (width * height > 1024 * 1024 || bitsPerComponent > 8) {
+        CGImageRelease(imageRef);
+
+        return image;
+    }
+
+    size_t bytesPerRow = 0; // CGImageGetBytesPerRow() calculates incorrectly in iOS 5.0, so defer to CGBitmapContextCreate
+    CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
+    CGColorSpaceModel colorSpaceModel = CGColorSpaceGetModel(colorSpace);
+    CGBitmapInfo bitmapInfo = CGImageGetBitmapInfo(imageRef);
+
+    if (colorSpaceModel == kCGColorSpaceModelRGB) {
+        uint32_t alpha = (bitmapInfo & kCGBitmapAlphaInfoMask);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wassign-enum"
+        if (alpha == kCGImageAlphaNone) {
+            bitmapInfo &= ~kCGBitmapAlphaInfoMask;
+            bitmapInfo |= kCGImageAlphaNoneSkipFirst;
+        } else if (!(alpha == kCGImageAlphaNoneSkipFirst || alpha == kCGImageAlphaNoneSkipLast)) {
+            bitmapInfo &= ~kCGBitmapAlphaInfoMask;
+            bitmapInfo |= kCGImageAlphaPremultipliedFirst;
+        }
+#pragma clang diagnostic pop
+    }
+
+    CGContextRef context = CGBitmapContextCreate(NULL, width, height, bitsPerComponent, bytesPerRow, colorSpace, bitmapInfo);
+
+    CGColorSpaceRelease(colorSpace);
+
+    if (!context) {
+        CGImageRelease(imageRef);
+
+        return image;
+    }
+
+    CGContextDrawImage(context, CGRectMake(0.0f, 0.0f, width, height), imageRef);
+    CGImageRef inflatedImageRef = CGBitmapContextCreateImage(context);
+
+    CGContextRelease(context);
+
+    UIImage *inflatedImage = [[UIImage alloc] initWithCGImage:inflatedImageRef scale:scale orientation:image.imageOrientation];
+
+    CGImageRelease(inflatedImageRef);
+    CGImageRelease(imageRef);
+    
+    return inflatedImage;
+}
+#endif
+
+
+@implementation AFImageResponseSerializer
+
+- (instancetype)init {
+    self = [super init];
+    if (!self) {
+        return nil;
+    }
+
+    self.acceptableContentTypes = [[NSSet alloc] initWithObjects:@"image/tiff", @"image/jpeg", @"image/gif", @"image/png", @"image/ico", @"image/x-icon", @"image/bmp", @"image/x-bmp", @"image/x-xbitmap", @"image/x-win-bitmap", nil];
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+    self.imageScale = [[UIScreen mainScreen] scale];
+    self.automaticallyInflatesResponseImage = YES;
+#endif
+
+    return self;
+}
+
+#pragma mark - AFURLResponseSerializer
+
+- (id)responseObjectForResponse:(NSURLResponse *)response
+                           data:(NSData *)data
+                          error:(NSError *__autoreleasing *)error
+{
+    if (![self validateResponse:(NSHTTPURLResponse *)response data:data error:error]) {
+        if (!error || AFErrorOrUnderlyingErrorHasCodeInDomain(*error, NSURLErrorCannotDecodeContentData, AFURLResponseSerializationErrorDomain)) {
+            return nil;
+        }
+    }
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+    if (self.automaticallyInflatesResponseImage) {
+        return AFInflatedImageFromResponseWithDataAtScale((NSHTTPURLResponse *)response, data, self.imageScale);
+    } else {
+        return AFImageWithDataAtScale(data, self.imageScale);
+    }
+#elif defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
+    // Ensure that the image is set to it's correct pixel width and height
+    NSBitmapImageRep *bitimage = [[NSBitmapImageRep alloc] initWithData:data];
+    NSImage *image = [[NSImage alloc] initWithSize:NSMakeSize([bitimage pixelsWide], [bitimage pixelsHigh])];
+    [image addRepresentation:bitimage];
+
+    return image;
+#endif
+
+    return nil;
+}
+
+#pragma mark - NSSecureCoding
+
+- (id)initWithCoder:(NSCoder *)decoder {
+    self = [super initWithCoder:decoder];
+    if (!self) {
+        return nil;
+    }
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+    NSNumber *imageScale = [decoder decodeObjectOfClass:[NSNumber class] forKey:NSStringFromSelector(@selector(imageScale))];
+#if CGFLOAT_IS_DOUBLE
+    self.imageScale = [imageScale doubleValue];
+#else
+    self.imageScale = [imageScale floatValue];
+#endif
+
+    self.automaticallyInflatesResponseImage = [decoder decodeBoolForKey:NSStringFromSelector(@selector(automaticallyInflatesResponseImage))];
+#endif
+
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+    [super encodeWithCoder:coder];
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+    [coder encodeObject:@(self.imageScale) forKey:NSStringFromSelector(@selector(imageScale))];
+    [coder encodeBool:self.automaticallyInflatesResponseImage forKey:NSStringFromSelector(@selector(automaticallyInflatesResponseImage))];
+#endif
+}
+
+#pragma mark - NSCopying
+
+- (id)copyWithZone:(NSZone *)zone {
+    AFImageResponseSerializer *serializer = [[[self class] allocWithZone:zone] init];
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+    serializer.imageScale = self.imageScale;
+    serializer.automaticallyInflatesResponseImage = self.automaticallyInflatesResponseImage;
+#endif
+
+    return serializer;
+}
+
+@end
+
+#pragma mark -
+
+@interface AFCompoundResponseSerializer ()
+@property (readwrite, nonatomic, copy) NSArray *responseSerializers;
+@end
+
+@implementation AFCompoundResponseSerializer
+
++ (instancetype)compoundSerializerWithResponseSerializers:(NSArray *)responseSerializers {
+    AFCompoundResponseSerializer *serializer = [[self alloc] init];
+    serializer.responseSerializers = responseSerializers;
+
+    return serializer;
+}
+
+#pragma mark - AFURLResponseSerialization
+
+- (id)responseObjectForResponse:(NSURLResponse *)response
+                           data:(NSData *)data
+                          error:(NSError *__autoreleasing *)error
+{
+    for (id <AFURLResponseSerialization> serializer in self.responseSerializers) {
+        if (![serializer isKindOfClass:[AFHTTPResponseSerializer class]]) {
+            continue;
+        }
+
+        NSError *serializerError = nil;
+        id responseObject = [serializer responseObjectForResponse:response data:data error:&serializerError];
+        if (responseObject) {
+            if (error) {
+                *error = AFErrorWithUnderlyingError(serializerError, *error);
+            }
+
+            return responseObject;
+        }
+    }
+    
+    return [super responseObjectForResponse:response data:data error:error];
+}
+
+#pragma mark - NSSecureCoding
+
+- (id)initWithCoder:(NSCoder *)decoder {
+    self = [super initWithCoder:decoder];
+    if (!self) {
+        return nil;
+    }
+
+    self.responseSerializers = [decoder decodeObjectOfClass:[NSArray class] forKey:NSStringFromSelector(@selector(responseSerializers))];
+
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+    [super encodeWithCoder:coder];
+
+    [coder encodeObject:self.responseSerializers forKey:NSStringFromSelector(@selector(responseSerializers))];
+}
+
+#pragma mark - NSCopying
+
+- (id)copyWithZone:(NSZone *)zone {
+    AFCompoundResponseSerializer *serializer = [[[self class] allocWithZone:zone] init];
+    serializer.responseSerializers = self.responseSerializers;
+
+    return serializer;
+}
+
+@end
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLSessionManager.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLSessionManager.h
new file mode 100644
index 000000000..f475773d0
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLSessionManager.h
@@ -0,0 +1,531 @@
+// AFURLSessionManager.h
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import <Foundation/Foundation.h>
+
+#import "AFURLResponseSerialization.h"
+#import "AFURLRequestSerialization.h"
+#import "AFSecurityPolicy.h"
+#import "AFNetworkReachabilityManager.h"
+
+/**
+ `AFURLSessionManager` creates and manages an `NSURLSession` object based on a specified `NSURLSessionConfiguration` object, which conforms to `<NSURLSessionTaskDelegate>`, `<NSURLSessionDataDelegate>`, `<NSURLSessionDownloadDelegate>`, and `<NSURLSessionDelegate>`.
+
+ ## Subclassing Notes
+
+ This is the base class for `AFHTTPSessionManager`, which adds functionality specific to making HTTP requests. If you are looking to extend `AFURLSessionManager` specifically for HTTP, consider subclassing `AFHTTPSessionManager` instead.
+
+ ## NSURLSession & NSURLSessionTask Delegate Methods
+
+ `AFURLSessionManager` implements the following delegate methods:
+
+ ### `NSURLSessionDelegate`
+
+ - `URLSession:didBecomeInvalidWithError:`
+ - `URLSession:didReceiveChallenge:completionHandler:`
+ - `URLSessionDidFinishEventsForBackgroundURLSession:`
+
+ ### `NSURLSessionTaskDelegate`
+
+ - `URLSession:willPerformHTTPRedirection:newRequest:completionHandler:`
+ - `URLSession:task:didReceiveChallenge:completionHandler:`
+ - `URLSession:task:didSendBodyData:totalBytesSent:totalBytesExpectedToSend:`
+ - `URLSession:task:didCompleteWithError:`
+
+ ### `NSURLSessionDataDelegate`
+
+ - `URLSession:dataTask:didReceiveResponse:completionHandler:`
+ - `URLSession:dataTask:didBecomeDownloadTask:`
+ - `URLSession:dataTask:didReceiveData:`
+ - `URLSession:dataTask:willCacheResponse:completionHandler:`
+
+ ### `NSURLSessionDownloadDelegate`
+
+ - `URLSession:downloadTask:didFinishDownloadingToURL:`
+ - `URLSession:downloadTask:didWriteData:totalBytesWritten:totalBytesWritten:totalBytesExpectedToWrite:`
+ - `URLSession:downloadTask:didResumeAtOffset:expectedTotalBytes:`
+
+ If any of these methods are overridden in a subclass, they _must_ call the `super` implementation first.
+
+ ## Network Reachability Monitoring
+
+ Network reachability status and change monitoring is available through the `reachabilityManager` property. Applications may choose to monitor network reachability conditions in order to prevent or suspend any outbound requests. See `AFNetworkReachabilityManager` for more details.
+
+ ## NSCoding Caveats
+
+ - Encoded managers do not include any block properties. Be sure to set delegate callback blocks when using `-initWithCoder:` or `NSKeyedUnarchiver`.
+
+ ## NSCopying Caveats
+
+ - `-copy` and `-copyWithZone:` return a new manager with a new `NSURLSession` created from the configuration of the original.
+ - Operation copies do not include any delegate callback blocks, as they often strongly captures a reference to `self`, which would otherwise have the unintuitive side-effect of pointing to the _original_ session manager when copied.
+
+ @warning Managers for background sessions must be owned for the duration of their use. This can be accomplished by creating an application-wide or shared singleton instance.
+ */
+
+#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000) || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090)
+
+@interface AFURLSessionManager : NSObject <NSURLSessionDelegate, NSURLSessionTaskDelegate, NSURLSessionDataDelegate, NSURLSessionDownloadDelegate, NSSecureCoding, NSCopying>
+
+/**
+ The managed session.
+ */
+@property (readonly, nonatomic, strong) NSURLSession *session;
+
+/**
+ The operation queue on which delegate callbacks are run.
+ */
+@property (readonly, nonatomic, strong) NSOperationQueue *operationQueue;
+
+/**
+ Responses sent from the server in data tasks created with `dataTaskWithRequest:success:failure:` and run using the `GET` / `POST` / et al. convenience methods are automatically validated and serialized by the response serializer. By default, this property is set to an instance of `AFJSONResponseSerializer`.
+
+ @warning `responseSerializer` must not be `nil`.
+ */
+@property (nonatomic, strong) id <AFURLResponseSerialization> responseSerializer;
+
+///-------------------------------
+/// @name Managing Security Policy
+///-------------------------------
+
+/**
+ The security policy used by created request operations to evaluate server trust for secure connections. `AFURLSessionManager` uses the `defaultPolicy` unless otherwise specified.
+ */
+@property (nonatomic, strong) AFSecurityPolicy *securityPolicy;
+
+///--------------------------------------
+/// @name Monitoring Network Reachability
+///--------------------------------------
+
+/**
+ The network reachability manager. `AFURLSessionManager` uses the `sharedManager` by default.
+ */
+@property (readwrite, nonatomic, strong) AFNetworkReachabilityManager *reachabilityManager;
+
+///----------------------------
+/// @name Getting Session Tasks
+///----------------------------
+
+/**
+ The data, upload, and download tasks currently run by the managed session.
+ */
+@property (readonly, nonatomic, strong) NSArray *tasks;
+
+/**
+ The data tasks currently run by the managed session.
+ */
+@property (readonly, nonatomic, strong) NSArray *dataTasks;
+
+/**
+ The upload tasks currently run by the managed session.
+ */
+@property (readonly, nonatomic, strong) NSArray *uploadTasks;
+
+/**
+ The download tasks currently run by the managed session.
+ */
+@property (readonly, nonatomic, strong) NSArray *downloadTasks;
+
+///-------------------------------
+/// @name Managing Callback Queues
+///-------------------------------
+
+/**
+ The dispatch queue for `completionBlock`. If `NULL` (default), the main queue is used.
+ */
+@property (nonatomic, strong) dispatch_queue_t completionQueue;
+
+/**
+ The dispatch group for `completionBlock`. If `NULL` (default), a private dispatch group is used.
+ */
+@property (nonatomic, strong) dispatch_group_t completionGroup;
+
+///---------------------------------
+/// @name Working Around System Bugs
+///---------------------------------
+
+/**
+ Whether to attempt to retry creation of upload tasks for background sessions when initial call returns `nil`. `NO` by default.
+
+ @bug As of iOS 7.0, there is a bug where upload tasks created for background tasks are sometimes `nil`. As a workaround, if this property is `YES`, AFNetworking will follow Apple's recommendation to try creating the task again.
+
+ @see https://github.com/AFNetworking/AFNetworking/issues/1675
+ */
+@property (nonatomic, assign) BOOL attemptsToRecreateUploadTasksForBackgroundSessions;
+
+///---------------------
+/// @name Initialization
+///---------------------
+
+/**
+ Creates and returns a manager for a session created with the specified configuration. This is the designated initializer.
+
+ @param configuration The configuration used to create the managed session.
+
+ @return A manager for a newly-created session.
+ */
+- (instancetype)initWithSessionConfiguration:(NSURLSessionConfiguration *)configuration;
+
+/**
+ Invalidates the managed session, optionally canceling pending tasks.
+
+ @param cancelPendingTasks Whether or not to cancel pending tasks.
+ */
+- (void)invalidateSessionCancelingTasks:(BOOL)cancelPendingTasks;
+
+///-------------------------
+/// @name Running Data Tasks
+///-------------------------
+
+/**
+ Creates an `NSURLSessionDataTask` with the specified request.
+
+ @param request The HTTP request for the request.
+ @param completionHandler A block object to be executed when the task finishes. This block has no return value and takes three arguments: the server response, the response object created by that serializer, and the error that occurred, if any.
+ */
+- (NSURLSessionDataTask *)dataTaskWithRequest:(NSURLRequest *)request
+                            completionHandler:(void (^)(NSURLResponse *response, id responseObject, NSError *error))completionHandler;
+
+///---------------------------
+/// @name Running Upload Tasks
+///---------------------------
+
+/**
+ Creates an `NSURLSessionUploadTask` with the specified request for a local file.
+
+ @param request The HTTP request for the request.
+ @param fileURL A URL to the local file to be uploaded.
+ @param progress A progress object monitoring the current upload progress.
+ @param completionHandler A block object to be executed when the task finishes. This block has no return value and takes three arguments: the server response, the response object created by that serializer, and the error that occurred, if any.
+
+ @see `attemptsToRecreateUploadTasksForBackgroundSessions`
+ */
+- (NSURLSessionUploadTask *)uploadTaskWithRequest:(NSURLRequest *)request
+                                         fromFile:(NSURL *)fileURL
+                                         progress:(NSProgress * __autoreleasing *)progress
+                                completionHandler:(void (^)(NSURLResponse *response, id responseObject, NSError *error))completionHandler;
+
+/**
+ Creates an `NSURLSessionUploadTask` with the specified request for an HTTP body.
+
+ @param request The HTTP request for the request.
+ @param bodyData A data object containing the HTTP body to be uploaded.
+ @param progress A progress object monitoring the current upload progress.
+ @param completionHandler A block object to be executed when the task finishes. This block has no return value and takes three arguments: the server response, the response object created by that serializer, and the error that occurred, if any.
+ */
+- (NSURLSessionUploadTask *)uploadTaskWithRequest:(NSURLRequest *)request
+                                         fromData:(NSData *)bodyData
+                                         progress:(NSProgress * __autoreleasing *)progress
+                                completionHandler:(void (^)(NSURLResponse *response, id responseObject, NSError *error))completionHandler;
+
+/**
+ Creates an `NSURLSessionUploadTask` with the specified streaming request.
+
+ @param request The HTTP request for the request.
+ @param progress A progress object monitoring the current upload progress.
+ @param completionHandler A block object to be executed when the task finishes. This block has no return value and takes three arguments: the server response, the response object created by that serializer, and the error that occurred, if any.
+ */
+- (NSURLSessionUploadTask *)uploadTaskWithStreamedRequest:(NSURLRequest *)request
+                                                 progress:(NSProgress * __autoreleasing *)progress
+                                        completionHandler:(void (^)(NSURLResponse *response, id responseObject, NSError *error))completionHandler;
+
+///-----------------------------
+/// @name Running Download Tasks
+///-----------------------------
+
+/**
+ Creates an `NSURLSessionDownloadTask` with the specified request.
+
+ @param request The HTTP request for the request.
+ @param progress A progress object monitoring the current download progress.
+ @param destination A block object to be executed in order to determine the destination of the downloaded file. This block takes two arguments, the target path & the server response, and returns the desired file URL of the resulting download. The temporary file used during the download will be automatically deleted after being moved to the returned URL.
+ @param completionHandler A block to be executed when a task finishes. This block has no return value and takes three arguments: the server response, the path of the downloaded file, and the error describing the network or parsing error that occurred, if any.
+
+ @warning If using a background `NSURLSessionConfiguration` on iOS, these blocks will be lost when the app is terminated. Background sessions may prefer to use `-setDownloadTaskDidFinishDownloadingBlock:` to specify the URL for saving the downloaded file, rather than the destination block of this method.
+ */
+- (NSURLSessionDownloadTask *)downloadTaskWithRequest:(NSURLRequest *)request
+                                             progress:(NSProgress * __autoreleasing *)progress
+                                          destination:(NSURL * (^)(NSURL *targetPath, NSURLResponse *response))destination
+                                    completionHandler:(void (^)(NSURLResponse *response, NSURL *filePath, NSError *error))completionHandler;
+
+/**
+ Creates an `NSURLSessionDownloadTask` with the specified resume data.
+
+ @param resumeData The data used to resume downloading.
+ @param progress A progress object monitoring the current download progress.
+ @param destination A block object to be executed in order to determine the destination of the downloaded file. This block takes two arguments, the target path & the server response, and returns the desired file URL of the resulting download. The temporary file used during the download will be automatically deleted after being moved to the returned URL.
+ @param completionHandler A block to be executed when a task finishes. This block has no return value and takes three arguments: the server response, the path of the downloaded file, and the error describing the network or parsing error that occurred, if any.
+ */
+- (NSURLSessionDownloadTask *)downloadTaskWithResumeData:(NSData *)resumeData
+                                                progress:(NSProgress * __autoreleasing *)progress
+                                             destination:(NSURL * (^)(NSURL *targetPath, NSURLResponse *response))destination
+                                       completionHandler:(void (^)(NSURLResponse *response, NSURL *filePath, NSError *error))completionHandler;
+
+///---------------------------------
+/// @name Getting Progress for Tasks
+///---------------------------------
+
+/**
+ Returns the upload progress of the specified task.
+
+ @param uploadTask The session upload task. Must not be `nil`.
+
+ @return An `NSProgress` object reporting the upload progress of a task, or `nil` if the progress is unavailable.
+ */
+- (NSProgress *)uploadProgressForTask:(NSURLSessionUploadTask *)uploadTask;
+
+/**
+ Returns the download progress of the specified task.
+
+ @param downloadTask The session download task. Must not be `nil`.
+
+ @return An `NSProgress` object reporting the download progress of a task, or `nil` if the progress is unavailable.
+ */
+- (NSProgress *)downloadProgressForTask:(NSURLSessionDownloadTask *)downloadTask;
+
+///-----------------------------------------
+/// @name Setting Session Delegate Callbacks
+///-----------------------------------------
+
+/**
+ Sets a block to be executed when the managed session becomes invalid, as handled by the `NSURLSessionDelegate` method `URLSession:didBecomeInvalidWithError:`.
+
+ @param block A block object to be executed when the managed session becomes invalid. The block has no return value, and takes two arguments: the session, and the error related to the cause of invalidation.
+ */
+- (void)setSessionDidBecomeInvalidBlock:(void (^)(NSURLSession *session, NSError *error))block;
+
+/**
+ Sets a block to be executed when a connection level authentication challenge has occurred, as handled by the `NSURLSessionDelegate` method `URLSession:didReceiveChallenge:completionHandler:`.
+
+ @param block A block object to be executed when a connection level authentication challenge has occurred. The block returns the disposition of the authentication challenge, and takes three arguments: the session, the authentication challenge, and a pointer to the credential that should be used to resolve the challenge.
+ */
+- (void)setSessionDidReceiveAuthenticationChallengeBlock:(NSURLSessionAuthChallengeDisposition (^)(NSURLSession *session, NSURLAuthenticationChallenge *challenge, NSURLCredential * __autoreleasing *credential))block;
+
+///--------------------------------------
+/// @name Setting Task Delegate Callbacks
+///--------------------------------------
+
+/**
+ Sets a block to be executed when a task requires a new request body stream to send to the remote server, as handled by the `NSURLSessionTaskDelegate` method `URLSession:task:needNewBodyStream:`.
+
+ @param block A block object to be executed when a task requires a new request body stream.
+ */
+- (void)setTaskNeedNewBodyStreamBlock:(NSInputStream * (^)(NSURLSession *session, NSURLSessionTask *task))block;
+
+/**
+ Sets a block to be executed when an HTTP request is attempting to perform a redirection to a different URL, as handled by the `NSURLSessionTaskDelegate` method `URLSession:willPerformHTTPRedirection:newRequest:completionHandler:`.
+
+ @param block A block object to be executed when an HTTP request is attempting to perform a redirection to a different URL. The block returns the request to be made for the redirection, and takes four arguments: the session, the task, the redirection response, and the request corresponding to the redirection response.
+ */
+- (void)setTaskWillPerformHTTPRedirectionBlock:(NSURLRequest * (^)(NSURLSession *session, NSURLSessionTask *task, NSURLResponse *response, NSURLRequest *request))block;
+
+/**
+ Sets a block to be executed when a session task has received a request specific authentication challenge, as handled by the `NSURLSessionTaskDelegate` method `URLSession:task:didReceiveChallenge:completionHandler:`.
+
+ @param block A block object to be executed when a session task has received a request specific authentication challenge. The block returns the disposition of the authentication challenge, and takes four arguments: the session, the task, the authentication challenge, and a pointer to the credential that should be used to resolve the challenge.
+ */
+- (void)setTaskDidReceiveAuthenticationChallengeBlock:(NSURLSessionAuthChallengeDisposition (^)(NSURLSession *session, NSURLSessionTask *task, NSURLAuthenticationChallenge *challenge, NSURLCredential * __autoreleasing *credential))block;
+
+/**
+ Sets a block to be executed periodically to track upload progress, as handled by the `NSURLSessionTaskDelegate` method `URLSession:task:didSendBodyData:totalBytesSent:totalBytesExpectedToSend:`.
+
+ @param block A block object to be called when an undetermined number of bytes have been uploaded to the server. This block has no return value and takes five arguments: the session, the task, the number of bytes written since the last time the upload progress block was called, the total bytes written, and the total bytes expected to be written during the request, as initially determined by the length of the HTTP body. This block may be called multiple times, and will execute on the main thread.
+ */
+- (void)setTaskDidSendBodyDataBlock:(void (^)(NSURLSession *session, NSURLSessionTask *task, int64_t bytesSent, int64_t totalBytesSent, int64_t totalBytesExpectedToSend))block;
+
+/**
+ Sets a block to be executed as the last message related to a specific task, as handled by the `NSURLSessionTaskDelegate` method `URLSession:task:didCompleteWithError:`.
+
+ @param block A block object to be executed when a session task is completed. The block has no return value, and takes three arguments: the session, the task, and any error that occurred in the process of executing the task.
+ */
+- (void)setTaskDidCompleteBlock:(void (^)(NSURLSession *session, NSURLSessionTask *task, NSError *error))block;
+
+///-------------------------------------------
+/// @name Setting Data Task Delegate Callbacks
+///-------------------------------------------
+
+/**
+ Sets a block to be executed when a data task has received a response, as handled by the `NSURLSessionDataDelegate` method `URLSession:dataTask:didReceiveResponse:completionHandler:`.
+
+ @param block A block object to be executed when a data task has received a response. The block returns the disposition of the session response, and takes three arguments: the session, the data task, and the received response.
+ */
+- (void)setDataTaskDidReceiveResponseBlock:(NSURLSessionResponseDisposition (^)(NSURLSession *session, NSURLSessionDataTask *dataTask, NSURLResponse *response))block;
+
+/**
+ Sets a block to be executed when a data task has become a download task, as handled by the `NSURLSessionDataDelegate` method `URLSession:dataTask:didBecomeDownloadTask:`.
+
+ @param block A block object to be executed when a data task has become a download task. The block has no return value, and takes three arguments: the session, the data task, and the download task it has become.
+ */
+- (void)setDataTaskDidBecomeDownloadTaskBlock:(void (^)(NSURLSession *session, NSURLSessionDataTask *dataTask, NSURLSessionDownloadTask *downloadTask))block;
+
+/**
+ Sets a block to be executed when a data task receives data, as handled by the `NSURLSessionDataDelegate` method `URLSession:dataTask:didReceiveData:`.
+
+ @param block A block object to be called when an undetermined number of bytes have been downloaded from the server. This block has no return value and takes three arguments: the session, the data task, and the data received. This block may be called multiple times, and will execute on the session manager operation queue.
+ */
+- (void)setDataTaskDidReceiveDataBlock:(void (^)(NSURLSession *session, NSURLSessionDataTask *dataTask, NSData *data))block;
+
+/**
+ Sets a block to be executed to determine the caching behavior of a data task, as handled by the `NSURLSessionDataDelegate` method `URLSession:dataTask:willCacheResponse:completionHandler:`.
+
+ @param block A block object to be executed to determine the caching behavior of a data task. The block returns the response to cache, and takes three arguments: the session, the data task, and the proposed cached URL response.
+ */
+- (void)setDataTaskWillCacheResponseBlock:(NSCachedURLResponse * (^)(NSURLSession *session, NSURLSessionDataTask *dataTask, NSCachedURLResponse *proposedResponse))block;
+
+/**
+ Sets a block to be executed once all messages enqueued for a session have been delivered, as handled by the `NSURLSessionDataDelegate` method `URLSessionDidFinishEventsForBackgroundURLSession:`.
+
+ @param block A block object to be executed once all messages enqueued for a session have been delivered. The block has no return value and takes a single argument: the session.
+ */
+- (void)setDidFinishEventsForBackgroundURLSessionBlock:(void (^)(NSURLSession *session))block;
+
+///-----------------------------------------------
+/// @name Setting Download Task Delegate Callbacks
+///-----------------------------------------------
+
+/**
+ Sets a block to be executed when a download task has completed a download, as handled by the `NSURLSessionDownloadDelegate` method `URLSession:downloadTask:didFinishDownloadingToURL:`.
+
+ @param block A block object to be executed when a download task has completed. The block returns the URL the download should be moved to, and takes three arguments: the session, the download task, and the temporary location of the downloaded file. If the file manager encounters an error while attempting to move the temporary file to the destination, an `AFURLSessionDownloadTaskDidFailToMoveFileNotification` will be posted, with the download task as its object, and the user info of the error.
+ */
+- (void)setDownloadTaskDidFinishDownloadingBlock:(NSURL * (^)(NSURLSession *session, NSURLSessionDownloadTask *downloadTask, NSURL *location))block;
+
+/**
+ Sets a block to be executed periodically to track download progress, as handled by the `NSURLSessionDownloadDelegate` method `URLSession:downloadTask:didWriteData:totalBytesWritten:totalBytesWritten:totalBytesExpectedToWrite:`.
+
+ @param block A block object to be called when an undetermined number of bytes have been downloaded from the server. This block has no return value and takes five arguments: the session, the download task, the number of bytes read since the last time the download progress block was called, the total bytes read, and the total bytes expected to be read during the request, as initially determined by the expected content size of the `NSHTTPURLResponse` object. This block may be called multiple times, and will execute on the session manager operation queue.
+ */
+- (void)setDownloadTaskDidWriteDataBlock:(void (^)(NSURLSession *session, NSURLSessionDownloadTask *downloadTask, int64_t bytesWritten, int64_t totalBytesWritten, int64_t totalBytesExpectedToWrite))block;
+
+/**
+ Sets a block to be executed when a download task has been resumed, as handled by the `NSURLSessionDownloadDelegate` method `URLSession:downloadTask:didResumeAtOffset:expectedTotalBytes:`.
+
+ @param block A block object to be executed when a download task has been resumed. The block has no return value and takes four arguments: the session, the download task, the file offset of the resumed download, and the total number of bytes expected to be downloaded.
+ */
+- (void)setDownloadTaskDidResumeBlock:(void (^)(NSURLSession *session, NSURLSessionDownloadTask *downloadTask, int64_t fileOffset, int64_t expectedTotalBytes))block;
+
+@end
+
+#endif
+
+///--------------------
+/// @name Notifications
+///--------------------
+
+/**
+ Posted when a task begins executing.
+
+ @deprecated Use `AFNetworkingTaskDidResumeNotification` instead.
+ */
+extern NSString * const AFNetworkingTaskDidStartNotification DEPRECATED_ATTRIBUTE;
+
+/**
+ Posted when a task resumes.
+ */
+extern NSString * const AFNetworkingTaskDidResumeNotification;
+
+/**
+ Posted when a task finishes executing. Includes a userInfo dictionary with additional information about the task.
+
+ @deprecated Use `AFNetworkingTaskDidCompleteNotification` instead.
+ */
+extern NSString * const AFNetworkingTaskDidFinishNotification DEPRECATED_ATTRIBUTE;
+
+/**
+ Posted when a task finishes executing. Includes a userInfo dictionary with additional information about the task.
+ */
+extern NSString * const AFNetworkingTaskDidCompleteNotification;
+
+/**
+ Posted when a task suspends its execution.
+ */
+extern NSString * const AFNetworkingTaskDidSuspendNotification;
+
+/**
+ Posted when a session is invalidated.
+ */
+extern NSString * const AFURLSessionDidInvalidateNotification;
+
+/**
+ Posted when a session download task encountered an error when moving the temporary download file to a specified destination.
+ */
+extern NSString * const AFURLSessionDownloadTaskDidFailToMoveFileNotification;
+
+/**
+ The raw response data of the task. Included in the userInfo dictionary of the `AFNetworkingTaskDidFinishNotification` if response data exists for the task.
+
+ @deprecated Use `AFNetworkingTaskDidCompleteResponseDataKey` instead.
+ */
+extern NSString * const AFNetworkingTaskDidFinishResponseDataKey DEPRECATED_ATTRIBUTE;
+
+/**
+ The raw response data of the task. Included in the userInfo dictionary of the `AFNetworkingTaskDidFinishNotification` if response data exists for the task.
+ */
+extern NSString * const AFNetworkingTaskDidCompleteResponseDataKey;
+
+/**
+ The serialized response object of the task. Included in the userInfo dictionary of the `AFNetworkingTaskDidFinishNotification` if the response was serialized.
+
+ @deprecated Use `AFNetworkingTaskDidCompleteSerializedResponseKey` instead.
+ */
+extern NSString * const AFNetworkingTaskDidFinishSerializedResponseKey DEPRECATED_ATTRIBUTE;
+
+/**
+ The serialized response object of the task. Included in the userInfo dictionary of the `AFNetworkingTaskDidFinishNotification` if the response was serialized.
+ */
+extern NSString * const AFNetworkingTaskDidCompleteSerializedResponseKey;
+
+/**
+ The response serializer used to serialize the response. Included in the userInfo dictionary of the `AFNetworkingTaskDidFinishNotification` if the task has an associated response serializer.
+
+ @deprecated Use `AFNetworkingTaskDidCompleteResponseSerializerKey` instead.
+ */
+extern NSString * const AFNetworkingTaskDidFinishResponseSerializerKey DEPRECATED_ATTRIBUTE;
+
+/**
+ The response serializer used to serialize the response. Included in the userInfo dictionary of the `AFNetworkingTaskDidFinishNotification` if the task has an associated response serializer.
+ */
+extern NSString * const AFNetworkingTaskDidCompleteResponseSerializerKey;
+
+/**
+ The file path associated with the download task. Included in the userInfo dictionary of the `AFNetworkingTaskDidFinishNotification` if an the response data has been stored directly to disk.
+
+ @deprecated Use `AFNetworkingTaskDidCompleteAssetPathKey` instead.
+ */
+extern NSString * const AFNetworkingTaskDidFinishAssetPathKey DEPRECATED_ATTRIBUTE;
+
+/**
+ The file path associated with the download task. Included in the userInfo dictionary of the `AFNetworkingTaskDidFinishNotification` if an the response data has been stored directly to disk.
+ */
+extern NSString * const AFNetworkingTaskDidCompleteAssetPathKey;
+
+/**
+ Any error associated with the task, or the serialization of the response. Included in the userInfo dictionary of the `AFNetworkingTaskDidFinishNotification` if an error exists.
+
+ @deprecated Use `AFNetworkingTaskDidCompleteErrorKey` instead.
+ */
+extern NSString * const AFNetworkingTaskDidFinishErrorKey DEPRECATED_ATTRIBUTE;
+
+/**
+ Any error associated with the task, or the serialization of the response. Included in the userInfo dictionary of the `AFNetworkingTaskDidFinishNotification` if an error exists.
+ */
+extern NSString * const AFNetworkingTaskDidCompleteErrorKey;
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLSessionManager.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLSessionManager.m
new file mode 100644
index 000000000..d53e6ec2d
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLSessionManager.m
@@ -0,0 +1,1079 @@
+// AFURLSessionManager.m
+// 
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import "AFURLSessionManager.h"
+#import <objc/runtime.h>
+
+#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000) || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090)
+
+static dispatch_queue_t url_session_manager_creation_queue() {
+    static dispatch_queue_t af_url_session_manager_creation_queue;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        af_url_session_manager_creation_queue = dispatch_queue_create("com.alamofire.networking.session.manager.creation", DISPATCH_QUEUE_SERIAL);
+    });
+
+    return af_url_session_manager_creation_queue;
+}
+
+static dispatch_queue_t url_session_manager_processing_queue() {
+    static dispatch_queue_t af_url_session_manager_processing_queue;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        af_url_session_manager_processing_queue = dispatch_queue_create("com.alamofire.networking.session.manager.processing", DISPATCH_QUEUE_CONCURRENT);
+    });
+
+    return af_url_session_manager_processing_queue;
+}
+
+static dispatch_group_t url_session_manager_completion_group() {
+    static dispatch_group_t af_url_session_manager_completion_group;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        af_url_session_manager_completion_group = dispatch_group_create();
+    });
+
+    return af_url_session_manager_completion_group;
+}
+
+NSString * const AFNetworkingTaskDidResumeNotification = @"com.alamofire.networking.task.resume";
+NSString * const AFNetworkingTaskDidCompleteNotification = @"com.alamofire.networking.task.complete";
+NSString * const AFNetworkingTaskDidSuspendNotification = @"com.alamofire.networking.task.suspend";
+NSString * const AFURLSessionDidInvalidateNotification = @"com.alamofire.networking.session.invalidate";
+NSString * const AFURLSessionDownloadTaskDidFailToMoveFileNotification = @"com.alamofire.networking.session.download.file-manager-error";
+
+NSString * const AFNetworkingTaskDidStartNotification = @"com.alamofire.networking.task.resume"; // Deprecated
+NSString * const AFNetworkingTaskDidFinishNotification = @"com.alamofire.networking.task.complete"; // Deprecated
+
+NSString * const AFNetworkingTaskDidCompleteSerializedResponseKey = @"com.alamofire.networking.task.complete.serializedresponse";
+NSString * const AFNetworkingTaskDidCompleteResponseSerializerKey = @"com.alamofire.networking.task.complete.responseserializer";
+NSString * const AFNetworkingTaskDidCompleteResponseDataKey = @"com.alamofire.networking.complete.finish.responsedata";
+NSString * const AFNetworkingTaskDidCompleteErrorKey = @"com.alamofire.networking.task.complete.error";
+NSString * const AFNetworkingTaskDidCompleteAssetPathKey = @"com.alamofire.networking.task.complete.assetpath";
+
+NSString * const AFNetworkingTaskDidFinishSerializedResponseKey = @"com.alamofire.networking.task.complete.serializedresponse"; // Deprecated
+NSString * const AFNetworkingTaskDidFinishResponseSerializerKey = @"com.alamofire.networking.task.complete.responseserializer"; // Deprecated
+NSString * const AFNetworkingTaskDidFinishResponseDataKey = @"com.alamofire.networking.complete.finish.responsedata"; // Deprecated
+NSString * const AFNetworkingTaskDidFinishErrorKey = @"com.alamofire.networking.task.complete.error"; // Deprecated
+NSString * const AFNetworkingTaskDidFinishAssetPathKey = @"com.alamofire.networking.task.complete.assetpath"; // Deprecated
+
+static NSString * const AFURLSessionManagerLockName = @"com.alamofire.networking.session.manager.lock";
+
+static NSUInteger const AFMaximumNumberOfAttemptsToRecreateBackgroundSessionUploadTask = 3;
+
+static void * AFTaskStateChangedContext = &AFTaskStateChangedContext;
+
+typedef void (^AFURLSessionDidBecomeInvalidBlock)(NSURLSession *session, NSError *error);
+typedef NSURLSessionAuthChallengeDisposition (^AFURLSessionDidReceiveAuthenticationChallengeBlock)(NSURLSession *session, NSURLAuthenticationChallenge *challenge, NSURLCredential * __autoreleasing *credential);
+
+typedef NSURLRequest * (^AFURLSessionTaskWillPerformHTTPRedirectionBlock)(NSURLSession *session, NSURLSessionTask *task, NSURLResponse *response, NSURLRequest *request);
+typedef NSURLSessionAuthChallengeDisposition (^AFURLSessionTaskDidReceiveAuthenticationChallengeBlock)(NSURLSession *session, NSURLSessionTask *task, NSURLAuthenticationChallenge *challenge, NSURLCredential * __autoreleasing *credential);
+typedef void (^AFURLSessionDidFinishEventsForBackgroundURLSessionBlock)(NSURLSession *session);
+
+typedef NSInputStream * (^AFURLSessionTaskNeedNewBodyStreamBlock)(NSURLSession *session, NSURLSessionTask *task);
+typedef void (^AFURLSessionTaskDidSendBodyDataBlock)(NSURLSession *session, NSURLSessionTask *task, int64_t bytesSent, int64_t totalBytesSent, int64_t totalBytesExpectedToSend);
+typedef void (^AFURLSessionTaskDidCompleteBlock)(NSURLSession *session, NSURLSessionTask *task, NSError *error);
+
+typedef NSURLSessionResponseDisposition (^AFURLSessionDataTaskDidReceiveResponseBlock)(NSURLSession *session, NSURLSessionDataTask *dataTask, NSURLResponse *response);
+typedef void (^AFURLSessionDataTaskDidBecomeDownloadTaskBlock)(NSURLSession *session, NSURLSessionDataTask *dataTask, NSURLSessionDownloadTask *downloadTask);
+typedef void (^AFURLSessionDataTaskDidReceiveDataBlock)(NSURLSession *session, NSURLSessionDataTask *dataTask, NSData *data);
+typedef NSCachedURLResponse * (^AFURLSessionDataTaskWillCacheResponseBlock)(NSURLSession *session, NSURLSessionDataTask *dataTask, NSCachedURLResponse *proposedResponse);
+
+typedef NSURL * (^AFURLSessionDownloadTaskDidFinishDownloadingBlock)(NSURLSession *session, NSURLSessionDownloadTask *downloadTask, NSURL *location);
+typedef void (^AFURLSessionDownloadTaskDidWriteDataBlock)(NSURLSession *session, NSURLSessionDownloadTask *downloadTask, int64_t bytesWritten, int64_t totalBytesWritten, int64_t totalBytesExpectedToWrite);
+typedef void (^AFURLSessionDownloadTaskDidResumeBlock)(NSURLSession *session, NSURLSessionDownloadTask *downloadTask, int64_t fileOffset, int64_t expectedTotalBytes);
+
+typedef void (^AFURLSessionTaskCompletionHandler)(NSURLResponse *response, id responseObject, NSError *error);
+
+#pragma mark -
+
+@interface AFURLSessionManagerTaskDelegate : NSObject <NSURLSessionTaskDelegate, NSURLSessionDataDelegate, NSURLSessionDownloadDelegate>
+@property (nonatomic, weak) AFURLSessionManager *manager;
+@property (nonatomic, strong) NSMutableData *mutableData;
+@property (nonatomic, strong) NSProgress *progress;
+@property (nonatomic, copy) NSURL *downloadFileURL;
+@property (nonatomic, copy) AFURLSessionDownloadTaskDidFinishDownloadingBlock downloadTaskDidFinishDownloading;
+@property (nonatomic, copy) AFURLSessionTaskCompletionHandler completionHandler;
+@end
+
+@implementation AFURLSessionManagerTaskDelegate
+
+- (instancetype)init {
+    self = [super init];
+    if (!self) {
+        return nil;
+    }
+
+    self.mutableData = [NSMutableData data];
+
+    self.progress = [NSProgress progressWithTotalUnitCount:0];
+
+    return self;
+}
+
+#pragma mark - NSURLSessionTaskDelegate
+
+- (void)URLSession:(__unused NSURLSession *)session
+              task:(__unused NSURLSessionTask *)task
+   didSendBodyData:(__unused int64_t)bytesSent
+    totalBytesSent:(int64_t)totalBytesSent
+totalBytesExpectedToSend:(int64_t)totalBytesExpectedToSend
+{
+    self.progress.totalUnitCount = totalBytesExpectedToSend;
+    self.progress.completedUnitCount = totalBytesSent;
+}
+
+- (void)URLSession:(__unused NSURLSession *)session
+              task:(NSURLSessionTask *)task
+didCompleteWithError:(NSError *)error
+{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu"
+    __strong AFURLSessionManager *manager = self.manager;
+
+    __block id responseObject = nil;
+
+    __block NSMutableDictionary *userInfo = [NSMutableDictionary dictionary];
+    userInfo[AFNetworkingTaskDidCompleteResponseSerializerKey] = manager.responseSerializer;
+
+    if (self.downloadFileURL) {
+        userInfo[AFNetworkingTaskDidCompleteAssetPathKey] = self.downloadFileURL;
+    } else if (self.mutableData) {
+        userInfo[AFNetworkingTaskDidCompleteResponseDataKey] = [NSData dataWithData:self.mutableData];
+    }
+
+    if (error) {
+        userInfo[AFNetworkingTaskDidCompleteErrorKey] = error;
+
+        dispatch_group_async(manager.completionGroup ?: url_session_manager_completion_group(), manager.completionQueue ?: dispatch_get_main_queue(), ^{
+            if (self.completionHandler) {
+                self.completionHandler(task.response, responseObject, error);
+            }
+
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [[NSNotificationCenter defaultCenter] postNotificationName:AFNetworkingTaskDidCompleteNotification object:task userInfo:userInfo];
+            });
+        });
+    } else {
+        dispatch_async(url_session_manager_processing_queue(), ^{
+            NSError *serializationError = nil;
+            responseObject = [manager.responseSerializer responseObjectForResponse:task.response data:[NSData dataWithData:self.mutableData] error:&serializationError];
+
+            if (self.downloadFileURL) {
+                responseObject = self.downloadFileURL;
+            }
+
+            if (responseObject) {
+                userInfo[AFNetworkingTaskDidCompleteSerializedResponseKey] = responseObject;
+            }
+
+            if (serializationError) {
+                userInfo[AFNetworkingTaskDidCompleteErrorKey] = serializationError;
+            }
+
+            dispatch_group_async(manager.completionGroup ?: url_session_manager_completion_group(), manager.completionQueue ?: dispatch_get_main_queue(), ^{
+                if (self.completionHandler) {
+                    self.completionHandler(task.response, responseObject, serializationError);
+                }
+                
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    [[NSNotificationCenter defaultCenter] postNotificationName:AFNetworkingTaskDidCompleteNotification object:task userInfo:userInfo];
+                });
+            });
+        });
+    }
+#pragma clang diagnostic pop
+}
+
+#pragma mark - NSURLSessionDataTaskDelegate
+
+- (void)URLSession:(__unused NSURLSession *)session
+          dataTask:(__unused NSURLSessionDataTask *)dataTask
+    didReceiveData:(NSData *)data
+{
+    [self.mutableData appendData:data];
+}
+
+#pragma mark - NSURLSessionDownloadTaskDelegate
+
+- (void)URLSession:(NSURLSession *)session
+      downloadTask:(NSURLSessionDownloadTask *)downloadTask
+didFinishDownloadingToURL:(NSURL *)location
+{
+    NSError *fileManagerError = nil;
+    self.downloadFileURL = nil;
+
+    if (self.downloadTaskDidFinishDownloading) {
+        self.downloadFileURL = self.downloadTaskDidFinishDownloading(session, downloadTask, location);
+        if (self.downloadFileURL) {
+            [[NSFileManager defaultManager] moveItemAtURL:location toURL:self.downloadFileURL error:&fileManagerError];
+
+            if (fileManagerError) {
+                [[NSNotificationCenter defaultCenter] postNotificationName:AFURLSessionDownloadTaskDidFailToMoveFileNotification object:downloadTask userInfo:fileManagerError.userInfo];
+            }
+        }
+    }
+}
+
+- (void)URLSession:(__unused NSURLSession *)session
+      downloadTask:(__unused NSURLSessionDownloadTask *)downloadTask
+      didWriteData:(__unused int64_t)bytesWritten
+ totalBytesWritten:(int64_t)totalBytesWritten
+totalBytesExpectedToWrite:(int64_t)totalBytesExpectedToWrite
+{
+    self.progress.totalUnitCount = totalBytesExpectedToWrite;
+    self.progress.completedUnitCount = totalBytesWritten;
+}
+
+- (void)URLSession:(__unused NSURLSession *)session
+      downloadTask:(__unused NSURLSessionDownloadTask *)downloadTask
+ didResumeAtOffset:(int64_t)fileOffset
+expectedTotalBytes:(int64_t)expectedTotalBytes {
+    self.progress.totalUnitCount = expectedTotalBytes;
+    self.progress.completedUnitCount = fileOffset;
+}
+
+@end
+
+#pragma mark -
+
+/*
+ A workaround for issues related to key-value observing the `state` of an `NSURLSessionTask`.
+
+ See https://github.com/AFNetworking/AFNetworking/issues/1477
+ */
+
+static inline void af_swizzleSelector(Class class, SEL originalSelector, SEL swizzledSelector) {
+    Method originalMethod = class_getInstanceMethod(class, originalSelector);
+    Method swizzledMethod = class_getInstanceMethod(class, swizzledSelector);
+    if (class_addMethod(class, originalSelector, method_getImplementation(swizzledMethod), method_getTypeEncoding(swizzledMethod))) {
+        class_replaceMethod(class, swizzledSelector, method_getImplementation(originalMethod), method_getTypeEncoding(originalMethod));
+    } else {
+        method_exchangeImplementations(originalMethod, swizzledMethod);
+    }
+}
+
+static NSString * const AFNSURLSessionTaskDidResumeNotification  = @"com.alamofire.networking.nsurlsessiontask.resume";
+static NSString * const AFNSURLSessionTaskDidSuspendNotification = @"com.alamofire.networking.nsurlsessiontask.suspend";
+
+@interface NSURLSessionTask (_AFStateObserving)
+@end
+
+@implementation NSURLSessionTask (_AFStateObserving)
+
++ (void)load {
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        af_swizzleSelector([self class], @selector(resume), @selector(af_resume));
+        af_swizzleSelector([self class], @selector(suspend), @selector(af_suspend));
+    });
+}
+
+#pragma mark -
+
+- (void)af_resume {
+    NSURLSessionTaskState state = self.state;
+    [self af_resume];
+
+    if (state != NSURLSessionTaskStateRunning) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:AFNSURLSessionTaskDidResumeNotification object:self];
+    }
+}
+
+- (void)af_suspend {
+    NSURLSessionTaskState state = self.state;
+    [self af_suspend];
+
+    if (state != NSURLSessionTaskStateSuspended) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:AFNSURLSessionTaskDidSuspendNotification object:self];
+    }
+}
+
+@end
+
+#pragma mark -
+
+@interface AFURLSessionManager ()
+@property (readwrite, nonatomic, strong) NSURLSessionConfiguration *sessionConfiguration;
+@property (readwrite, nonatomic, strong) NSOperationQueue *operationQueue;
+@property (readwrite, nonatomic, strong) NSURLSession *session;
+@property (readwrite, nonatomic, strong) NSMutableDictionary *mutableTaskDelegatesKeyedByTaskIdentifier;
+@property (readwrite, nonatomic, strong) NSLock *lock;
+@property (readwrite, nonatomic, copy) AFURLSessionDidBecomeInvalidBlock sessionDidBecomeInvalid;
+@property (readwrite, nonatomic, copy) AFURLSessionDidReceiveAuthenticationChallengeBlock sessionDidReceiveAuthenticationChallenge;
+@property (readwrite, nonatomic, copy) AFURLSessionDidFinishEventsForBackgroundURLSessionBlock didFinishEventsForBackgroundURLSession;
+@property (readwrite, nonatomic, copy) AFURLSessionTaskWillPerformHTTPRedirectionBlock taskWillPerformHTTPRedirection;
+@property (readwrite, nonatomic, copy) AFURLSessionTaskDidReceiveAuthenticationChallengeBlock taskDidReceiveAuthenticationChallenge;
+@property (readwrite, nonatomic, copy) AFURLSessionTaskNeedNewBodyStreamBlock taskNeedNewBodyStream;
+@property (readwrite, nonatomic, copy) AFURLSessionTaskDidSendBodyDataBlock taskDidSendBodyData;
+@property (readwrite, nonatomic, copy) AFURLSessionTaskDidCompleteBlock taskDidComplete;
+@property (readwrite, nonatomic, copy) AFURLSessionDataTaskDidReceiveResponseBlock dataTaskDidReceiveResponse;
+@property (readwrite, nonatomic, copy) AFURLSessionDataTaskDidBecomeDownloadTaskBlock dataTaskDidBecomeDownloadTask;
+@property (readwrite, nonatomic, copy) AFURLSessionDataTaskDidReceiveDataBlock dataTaskDidReceiveData;
+@property (readwrite, nonatomic, copy) AFURLSessionDataTaskWillCacheResponseBlock dataTaskWillCacheResponse;
+@property (readwrite, nonatomic, copy) AFURLSessionDownloadTaskDidFinishDownloadingBlock downloadTaskDidFinishDownloading;
+@property (readwrite, nonatomic, copy) AFURLSessionDownloadTaskDidWriteDataBlock downloadTaskDidWriteData;
+@property (readwrite, nonatomic, copy) AFURLSessionDownloadTaskDidResumeBlock downloadTaskDidResume;
+@end
+
+@implementation AFURLSessionManager
+
+- (instancetype)init {
+    return [self initWithSessionConfiguration:nil];
+}
+
+- (instancetype)initWithSessionConfiguration:(NSURLSessionConfiguration *)configuration {
+    self = [super init];
+    if (!self) {
+        return nil;
+    }
+
+    if (!configuration) {
+        configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
+    }
+
+    self.sessionConfiguration = configuration;
+
+    self.operationQueue = [[NSOperationQueue alloc] init];
+    self.operationQueue.maxConcurrentOperationCount = 1;
+
+    self.session = [NSURLSession sessionWithConfiguration:self.sessionConfiguration delegate:self delegateQueue:self.operationQueue];
+
+    self.responseSerializer = [AFJSONResponseSerializer serializer];
+
+    self.securityPolicy = [AFSecurityPolicy defaultPolicy];
+
+    self.reachabilityManager = [AFNetworkReachabilityManager sharedManager];
+
+    self.mutableTaskDelegatesKeyedByTaskIdentifier = [[NSMutableDictionary alloc] init];
+
+    self.lock = [[NSLock alloc] init];
+    self.lock.name = AFURLSessionManagerLockName;
+    
+    [self.session getTasksWithCompletionHandler:^(NSArray *dataTasks, NSArray *uploadTasks, NSArray *downloadTasks) {
+        for (NSURLSessionDataTask *task in dataTasks) {
+            [self addDelegateForDataTask:task completionHandler:nil];
+        }
+        
+        for (NSURLSessionUploadTask *uploadTask in uploadTasks) {
+            [self addDelegateForUploadTask:uploadTask progress:nil completionHandler:nil];
+        }
+        
+        for (NSURLSessionDownloadTask *downloadTask in downloadTasks) {
+            [self addDelegateForDownloadTask:downloadTask progress:nil destination:nil completionHandler:nil];
+        }
+    }];
+
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(taskDidResume:) name:AFNSURLSessionTaskDidResumeNotification object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(taskDidSuspend:) name:AFNSURLSessionTaskDidSuspendNotification object:nil];
+
+    return self;
+}
+
+- (void)dealloc {
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (void)taskDidResume:(NSNotification *)notification {
+    NSURLSessionTask *task = notification.object;
+    if ([task isKindOfClass:[NSURLSessionTask class]]) {
+        AFURLSessionManager *manager = [self delegateForTask:task].manager;
+        if ([manager isEqual:self]) {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [[NSNotificationCenter defaultCenter] postNotificationName:AFNetworkingTaskDidResumeNotification object:task];
+            });
+        }
+    }
+}
+
+- (void)taskDidSuspend:(NSNotification *)notification {
+    NSURLSessionTask *task = notification.object;
+    if ([task isKindOfClass:[NSURLSessionTask class]]) {
+        AFURLSessionManager *manager = [self delegateForTask:task].manager;
+        if ([manager isEqual:self]) {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [[NSNotificationCenter defaultCenter] postNotificationName:AFNetworkingTaskDidSuspendNotification object:task];
+            });
+        }
+    }
+}
+
+#pragma mark -
+
+- (AFURLSessionManagerTaskDelegate *)delegateForTask:(NSURLSessionTask *)task {
+    NSParameterAssert(task);
+
+    AFURLSessionManagerTaskDelegate *delegate = nil;
+    [self.lock lock];
+    delegate = self.mutableTaskDelegatesKeyedByTaskIdentifier[@(task.taskIdentifier)];
+    [self.lock unlock];
+
+    return delegate;
+}
+
+- (void)setDelegate:(AFURLSessionManagerTaskDelegate *)delegate
+            forTask:(NSURLSessionTask *)task
+{
+    NSParameterAssert(task);
+    NSParameterAssert(delegate);
+
+    [self.lock lock];
+    self.mutableTaskDelegatesKeyedByTaskIdentifier[@(task.taskIdentifier)] = delegate;
+    [self.lock unlock];
+}
+
+- (void)addDelegateForDataTask:(NSURLSessionDataTask *)dataTask
+             completionHandler:(void (^)(NSURLResponse *response, id responseObject, NSError *error))completionHandler
+{
+    AFURLSessionManagerTaskDelegate *delegate = [[AFURLSessionManagerTaskDelegate alloc] init];
+    delegate.manager = self;
+    delegate.completionHandler = completionHandler;
+
+    [self setDelegate:delegate forTask:dataTask];
+}
+
+- (void)addDelegateForUploadTask:(NSURLSessionUploadTask *)uploadTask
+                        progress:(NSProgress * __autoreleasing *)progress
+               completionHandler:(void (^)(NSURLResponse *response, id responseObject, NSError *error))completionHandler
+{
+    AFURLSessionManagerTaskDelegate *delegate = [[AFURLSessionManagerTaskDelegate alloc] init];
+    delegate.manager = self;
+    delegate.completionHandler = completionHandler;
+
+    int64_t totalUnitCount = uploadTask.countOfBytesExpectedToSend;
+    if(totalUnitCount == NSURLSessionTransferSizeUnknown) {
+        NSString *contentLength = [uploadTask.originalRequest valueForHTTPHeaderField:@"Content-Length"];
+        if(contentLength) {
+            totalUnitCount = (int64_t) [contentLength longLongValue];
+        }
+    }
+
+    delegate.progress = [NSProgress progressWithTotalUnitCount:totalUnitCount];
+    delegate.progress.pausingHandler = ^{
+        [uploadTask suspend];
+    };
+    delegate.progress.cancellationHandler = ^{
+        [uploadTask cancel];
+    };
+
+    if (progress) {
+        *progress = delegate.progress;
+    }
+
+    [self setDelegate:delegate forTask:uploadTask];
+}
+
+- (void)addDelegateForDownloadTask:(NSURLSessionDownloadTask *)downloadTask
+                          progress:(NSProgress * __autoreleasing *)progress
+                       destination:(NSURL * (^)(NSURL *targetPath, NSURLResponse *response))destination
+                 completionHandler:(void (^)(NSURLResponse *response, NSURL *filePath, NSError *error))completionHandler
+{
+    AFURLSessionManagerTaskDelegate *delegate = [[AFURLSessionManagerTaskDelegate alloc] init];
+    delegate.manager = self;
+    delegate.completionHandler = completionHandler;
+
+    if (destination) {
+        delegate.downloadTaskDidFinishDownloading = ^NSURL * (NSURLSession * __unused session, NSURLSessionDownloadTask *task, NSURL *location) {
+            return destination(location, task.response);
+        };
+    }
+
+    if (progress) {
+        *progress = delegate.progress;
+    }
+
+    [self setDelegate:delegate forTask:downloadTask];
+}
+
+- (void)removeDelegateForTask:(NSURLSessionTask *)task {
+    NSParameterAssert(task);
+
+    [self.lock lock];
+    [self.mutableTaskDelegatesKeyedByTaskIdentifier removeObjectForKey:@(task.taskIdentifier)];
+    [self.lock unlock];
+}
+
+- (void)removeAllDelegates {
+    [self.lock lock];
+    [self.mutableTaskDelegatesKeyedByTaskIdentifier removeAllObjects];
+    [self.lock unlock];
+}
+
+#pragma mark -
+
+- (NSArray *)tasksForKeyPath:(NSString *)keyPath {
+    __block NSArray *tasks = nil;
+    dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+    [self.session getTasksWithCompletionHandler:^(NSArray *dataTasks, NSArray *uploadTasks, NSArray *downloadTasks) {
+        if ([keyPath isEqualToString:NSStringFromSelector(@selector(dataTasks))]) {
+            tasks = dataTasks;
+        } else if ([keyPath isEqualToString:NSStringFromSelector(@selector(uploadTasks))]) {
+            tasks = uploadTasks;
+        } else if ([keyPath isEqualToString:NSStringFromSelector(@selector(downloadTasks))]) {
+            tasks = downloadTasks;
+        } else if ([keyPath isEqualToString:NSStringFromSelector(@selector(tasks))]) {
+            tasks = [@[dataTasks, uploadTasks, downloadTasks] valueForKeyPath:@"@unionOfArrays.self"];
+        }
+
+        dispatch_semaphore_signal(semaphore);
+    }];
+
+    dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+
+    return tasks;
+}
+
+- (NSArray *)tasks {
+    return [self tasksForKeyPath:NSStringFromSelector(_cmd)];
+}
+
+- (NSArray *)dataTasks {
+    return [self tasksForKeyPath:NSStringFromSelector(_cmd)];
+}
+
+- (NSArray *)uploadTasks {
+    return [self tasksForKeyPath:NSStringFromSelector(_cmd)];
+}
+
+- (NSArray *)downloadTasks {
+    return [self tasksForKeyPath:NSStringFromSelector(_cmd)];
+}
+
+#pragma mark -
+
+- (void)invalidateSessionCancelingTasks:(BOOL)cancelPendingTasks {
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if (cancelPendingTasks) {
+            [self.session invalidateAndCancel];
+        } else {
+            [self.session finishTasksAndInvalidate];
+        }
+    });
+}
+
+#pragma mark -
+
+- (void)setResponseSerializer:(id <AFURLResponseSerialization>)responseSerializer {
+    NSParameterAssert(responseSerializer);
+
+    _responseSerializer = responseSerializer;
+}
+
+#pragma mark -
+
+- (NSURLSessionDataTask *)dataTaskWithRequest:(NSURLRequest *)request
+                            completionHandler:(void (^)(NSURLResponse *response, id responseObject, NSError *error))completionHandler
+{
+    __block NSURLSessionDataTask *dataTask = nil;
+    dispatch_sync(url_session_manager_creation_queue(), ^{
+        dataTask = [self.session dataTaskWithRequest:request];
+    });
+
+    [self addDelegateForDataTask:dataTask completionHandler:completionHandler];
+
+    return dataTask;
+}
+
+#pragma mark -
+
+- (NSURLSessionUploadTask *)uploadTaskWithRequest:(NSURLRequest *)request
+                                         fromFile:(NSURL *)fileURL
+                                         progress:(NSProgress * __autoreleasing *)progress
+                                completionHandler:(void (^)(NSURLResponse *response, id responseObject, NSError *error))completionHandler
+{
+    __block NSURLSessionUploadTask *uploadTask = nil;
+    dispatch_sync(url_session_manager_creation_queue(), ^{
+        uploadTask = [self.session uploadTaskWithRequest:request fromFile:fileURL];
+    });
+
+    if (!uploadTask && self.attemptsToRecreateUploadTasksForBackgroundSessions && self.session.configuration.identifier) {
+        for (NSUInteger attempts = 0; !uploadTask && attempts < AFMaximumNumberOfAttemptsToRecreateBackgroundSessionUploadTask; attempts++) {
+            uploadTask = [self.session uploadTaskWithRequest:request fromFile:fileURL];
+        }
+    }
+
+    [self addDelegateForUploadTask:uploadTask progress:progress completionHandler:completionHandler];
+
+    return uploadTask;
+}
+
+- (NSURLSessionUploadTask *)uploadTaskWithRequest:(NSURLRequest *)request
+                                         fromData:(NSData *)bodyData
+                                         progress:(NSProgress * __autoreleasing *)progress
+                                completionHandler:(void (^)(NSURLResponse *response, id responseObject, NSError *error))completionHandler
+{
+    __block NSURLSessionUploadTask *uploadTask = nil;
+    dispatch_sync(url_session_manager_creation_queue(), ^{
+        uploadTask = [self.session uploadTaskWithRequest:request fromData:bodyData];
+    });
+
+    [self addDelegateForUploadTask:uploadTask progress:progress completionHandler:completionHandler];
+
+    return uploadTask;
+}
+
+- (NSURLSessionUploadTask *)uploadTaskWithStreamedRequest:(NSURLRequest *)request
+                                                 progress:(NSProgress * __autoreleasing *)progress
+                                        completionHandler:(void (^)(NSURLResponse *response, id responseObject, NSError *error))completionHandler
+{
+    __block NSURLSessionUploadTask *uploadTask = nil;
+    dispatch_sync(url_session_manager_creation_queue(), ^{
+        uploadTask = [self.session uploadTaskWithStreamedRequest:request];
+    });
+
+    [self addDelegateForUploadTask:uploadTask progress:progress completionHandler:completionHandler];
+
+    return uploadTask;
+}
+
+#pragma mark -
+
+- (NSURLSessionDownloadTask *)downloadTaskWithRequest:(NSURLRequest *)request
+                                             progress:(NSProgress * __autoreleasing *)progress
+                                          destination:(NSURL * (^)(NSURL *targetPath, NSURLResponse *response))destination
+                                    completionHandler:(void (^)(NSURLResponse *response, NSURL *filePath, NSError *error))completionHandler
+{
+    __block NSURLSessionDownloadTask *downloadTask = nil;
+    dispatch_sync(url_session_manager_creation_queue(), ^{
+        downloadTask = [self.session downloadTaskWithRequest:request];
+    });
+
+    [self addDelegateForDownloadTask:downloadTask progress:progress destination:destination completionHandler:completionHandler];
+
+    return downloadTask;
+}
+
+- (NSURLSessionDownloadTask *)downloadTaskWithResumeData:(NSData *)resumeData
+                                                progress:(NSProgress * __autoreleasing *)progress
+                                             destination:(NSURL * (^)(NSURL *targetPath, NSURLResponse *response))destination
+                                       completionHandler:(void (^)(NSURLResponse *response, NSURL *filePath, NSError *error))completionHandler
+{
+    __block NSURLSessionDownloadTask *downloadTask = nil;
+    dispatch_sync(url_session_manager_creation_queue(), ^{
+        downloadTask = [self.session downloadTaskWithResumeData:resumeData];
+    });
+
+    [self addDelegateForDownloadTask:downloadTask progress:progress destination:destination completionHandler:completionHandler];
+
+    return downloadTask;
+}
+
+#pragma mark -
+
+- (NSProgress *)uploadProgressForTask:(NSURLSessionUploadTask *)uploadTask {
+    return [[self delegateForTask:uploadTask] progress];
+}
+
+- (NSProgress *)downloadProgressForTask:(NSURLSessionDownloadTask *)downloadTask {
+    return [[self delegateForTask:downloadTask] progress];
+}
+
+#pragma mark -
+
+- (void)setSessionDidBecomeInvalidBlock:(void (^)(NSURLSession *session, NSError *error))block {
+    self.sessionDidBecomeInvalid = block;
+}
+
+- (void)setSessionDidReceiveAuthenticationChallengeBlock:(NSURLSessionAuthChallengeDisposition (^)(NSURLSession *session, NSURLAuthenticationChallenge *challenge, NSURLCredential * __autoreleasing *credential))block {
+    self.sessionDidReceiveAuthenticationChallenge = block;
+}
+
+- (void)setDidFinishEventsForBackgroundURLSessionBlock:(void (^)(NSURLSession *session))block {
+    self.didFinishEventsForBackgroundURLSession = block;
+}
+
+#pragma mark -
+
+- (void)setTaskNeedNewBodyStreamBlock:(NSInputStream * (^)(NSURLSession *session, NSURLSessionTask *task))block {
+    self.taskNeedNewBodyStream = block;
+}
+
+- (void)setTaskWillPerformHTTPRedirectionBlock:(NSURLRequest * (^)(NSURLSession *session, NSURLSessionTask *task, NSURLResponse *response, NSURLRequest *request))block {
+    self.taskWillPerformHTTPRedirection = block;
+}
+
+- (void)setTaskDidReceiveAuthenticationChallengeBlock:(NSURLSessionAuthChallengeDisposition (^)(NSURLSession *session, NSURLSessionTask *task, NSURLAuthenticationChallenge *challenge, NSURLCredential * __autoreleasing *credential))block {
+    self.taskDidReceiveAuthenticationChallenge = block;
+}
+
+- (void)setTaskDidSendBodyDataBlock:(void (^)(NSURLSession *session, NSURLSessionTask *task, int64_t bytesSent, int64_t totalBytesSent, int64_t totalBytesExpectedToSend))block {
+    self.taskDidSendBodyData = block;
+}
+
+- (void)setTaskDidCompleteBlock:(void (^)(NSURLSession *session, NSURLSessionTask *task, NSError *error))block {
+    self.taskDidComplete = block;
+}
+
+#pragma mark -
+
+- (void)setDataTaskDidReceiveResponseBlock:(NSURLSessionResponseDisposition (^)(NSURLSession *session, NSURLSessionDataTask *dataTask, NSURLResponse *response))block {
+    self.dataTaskDidReceiveResponse = block;
+}
+
+- (void)setDataTaskDidBecomeDownloadTaskBlock:(void (^)(NSURLSession *session, NSURLSessionDataTask *dataTask, NSURLSessionDownloadTask *downloadTask))block {
+    self.dataTaskDidBecomeDownloadTask = block;
+}
+
+- (void)setDataTaskDidReceiveDataBlock:(void (^)(NSURLSession *session, NSURLSessionDataTask *dataTask, NSData *data))block {
+    self.dataTaskDidReceiveData = block;
+}
+
+- (void)setDataTaskWillCacheResponseBlock:(NSCachedURLResponse * (^)(NSURLSession *session, NSURLSessionDataTask *dataTask, NSCachedURLResponse *proposedResponse))block {
+    self.dataTaskWillCacheResponse = block;
+}
+
+#pragma mark -
+
+- (void)setDownloadTaskDidFinishDownloadingBlock:(NSURL * (^)(NSURLSession *session, NSURLSessionDownloadTask *downloadTask, NSURL *location))block {
+    self.downloadTaskDidFinishDownloading = block;
+}
+
+- (void)setDownloadTaskDidWriteDataBlock:(void (^)(NSURLSession *session, NSURLSessionDownloadTask *downloadTask, int64_t bytesWritten, int64_t totalBytesWritten, int64_t totalBytesExpectedToWrite))block {
+    self.downloadTaskDidWriteData = block;
+}
+
+- (void)setDownloadTaskDidResumeBlock:(void (^)(NSURLSession *session, NSURLSessionDownloadTask *downloadTask, int64_t fileOffset, int64_t expectedTotalBytes))block {
+    self.downloadTaskDidResume = block;
+}
+
+#pragma mark - NSObject
+
+- (NSString *)description {
+    return [NSString stringWithFormat:@"<%@: %p, session: %@, operationQueue: %@>", NSStringFromClass([self class]), self, self.session, self.operationQueue];
+}
+
+- (BOOL)respondsToSelector:(SEL)selector {
+    if (selector == @selector(URLSession:task:willPerformHTTPRedirection:newRequest:completionHandler:)) {
+        return self.taskWillPerformHTTPRedirection != nil;
+    } else if (selector == @selector(URLSession:dataTask:didReceiveResponse:completionHandler:)) {
+        return self.dataTaskDidReceiveResponse != nil;
+    } else if (selector == @selector(URLSession:dataTask:willCacheResponse:completionHandler:)) {
+        return self.dataTaskWillCacheResponse != nil;
+    } else if (selector == @selector(URLSessionDidFinishEventsForBackgroundURLSession:)) {
+        return self.didFinishEventsForBackgroundURLSession != nil;
+    }
+
+    return [[self class] instancesRespondToSelector:selector];
+}
+
+#pragma mark - NSURLSessionDelegate
+
+- (void)URLSession:(NSURLSession *)session
+didBecomeInvalidWithError:(NSError *)error
+{
+    if (self.sessionDidBecomeInvalid) {
+        self.sessionDidBecomeInvalid(session, error);
+    }
+
+    [self removeAllDelegates];
+    [[NSNotificationCenter defaultCenter] postNotificationName:AFURLSessionDidInvalidateNotification object:session];
+}
+
+- (void)URLSession:(NSURLSession *)session
+didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge
+ completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential *credential))completionHandler
+{
+    NSURLSessionAuthChallengeDisposition disposition = NSURLSessionAuthChallengePerformDefaultHandling;
+    __block NSURLCredential *credential = nil;
+
+    if (self.sessionDidReceiveAuthenticationChallenge) {
+        disposition = self.sessionDidReceiveAuthenticationChallenge(session, challenge, &credential);
+    } else {
+        if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) {
+            if ([self.securityPolicy evaluateServerTrust:challenge.protectionSpace.serverTrust forDomain:challenge.protectionSpace.host]) {
+                credential = [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust];
+                if (credential) {
+                    disposition = NSURLSessionAuthChallengeUseCredential;
+                } else {
+                    disposition = NSURLSessionAuthChallengePerformDefaultHandling;
+                }
+            } else {
+                disposition = NSURLSessionAuthChallengeCancelAuthenticationChallenge;
+            }
+        } else {
+            disposition = NSURLSessionAuthChallengePerformDefaultHandling;
+        }
+    }
+
+    if (completionHandler) {
+        completionHandler(disposition, credential);
+    }
+}
+
+#pragma mark - NSURLSessionTaskDelegate
+
+- (void)URLSession:(NSURLSession *)session
+              task:(NSURLSessionTask *)task
+willPerformHTTPRedirection:(NSHTTPURLResponse *)response
+        newRequest:(NSURLRequest *)request
+ completionHandler:(void (^)(NSURLRequest *))completionHandler
+{
+    NSURLRequest *redirectRequest = request;
+
+    if (self.taskWillPerformHTTPRedirection) {
+        redirectRequest = self.taskWillPerformHTTPRedirection(session, task, response, request);
+    }
+
+    if (completionHandler) {
+        completionHandler(redirectRequest);
+    }
+}
+
+- (void)URLSession:(NSURLSession *)session
+              task:(NSURLSessionTask *)task
+didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge
+ completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential *credential))completionHandler
+{
+    NSURLSessionAuthChallengeDisposition disposition = NSURLSessionAuthChallengePerformDefaultHandling;
+    __block NSURLCredential *credential = nil;
+
+    if (self.taskDidReceiveAuthenticationChallenge) {
+        disposition = self.taskDidReceiveAuthenticationChallenge(session, task, challenge, &credential);
+    } else {
+        if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) {
+            if ([self.securityPolicy evaluateServerTrust:challenge.protectionSpace.serverTrust forDomain:challenge.protectionSpace.host]) {
+                disposition = NSURLSessionAuthChallengeUseCredential;
+                credential = [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust];
+            } else {
+                disposition = NSURLSessionAuthChallengeCancelAuthenticationChallenge;
+            }
+        } else {
+            disposition = NSURLSessionAuthChallengePerformDefaultHandling;
+        }
+    }
+
+    if (completionHandler) {
+        completionHandler(disposition, credential);
+    }
+}
+
+- (void)URLSession:(NSURLSession *)session
+              task:(NSURLSessionTask *)task
+ needNewBodyStream:(void (^)(NSInputStream *bodyStream))completionHandler
+{
+    NSInputStream *inputStream = nil;
+    
+    if (self.taskNeedNewBodyStream) {
+        inputStream = self.taskNeedNewBodyStream(session, task);
+    } else if (task.originalRequest.HTTPBodyStream && [task.originalRequest.HTTPBodyStream conformsToProtocol:@protocol(NSCopying)]) {
+        inputStream = [task.originalRequest.HTTPBodyStream copy];
+    }
+
+    if (completionHandler) {
+        completionHandler(inputStream);
+    }
+}
+
+- (void)URLSession:(NSURLSession *)session
+              task:(NSURLSessionTask *)task
+   didSendBodyData:(int64_t)bytesSent
+    totalBytesSent:(int64_t)totalBytesSent
+totalBytesExpectedToSend:(int64_t)totalBytesExpectedToSend
+{
+    
+    int64_t totalUnitCount = totalBytesExpectedToSend;
+    if(totalUnitCount == NSURLSessionTransferSizeUnknown) {
+        NSString *contentLength = [task.originalRequest valueForHTTPHeaderField:@"Content-Length"];
+        if(contentLength) {
+            totalUnitCount = (int64_t) [contentLength longLongValue];
+        }
+    }
+    
+    AFURLSessionManagerTaskDelegate *delegate = [self delegateForTask:task];
+    [delegate URLSession:session task:task didSendBodyData:bytesSent totalBytesSent:totalBytesSent totalBytesExpectedToSend:totalUnitCount];
+
+    if (self.taskDidSendBodyData) {
+        self.taskDidSendBodyData(session, task, bytesSent, totalBytesSent, totalUnitCount);
+    }
+}
+
+- (void)URLSession:(NSURLSession *)session
+              task:(NSURLSessionTask *)task
+didCompleteWithError:(NSError *)error
+{
+    AFURLSessionManagerTaskDelegate *delegate = [self delegateForTask:task];
+
+    // delegate may be nil when completing a task in the background
+    if (delegate) {
+        [delegate URLSession:session task:task didCompleteWithError:error];
+
+        [self removeDelegateForTask:task];
+    }
+
+    if (self.taskDidComplete) {
+        self.taskDidComplete(session, task, error);
+    }
+
+}
+
+#pragma mark - NSURLSessionDataDelegate
+
+- (void)URLSession:(NSURLSession *)session
+          dataTask:(NSURLSessionDataTask *)dataTask
+didReceiveResponse:(NSURLResponse *)response
+ completionHandler:(void (^)(NSURLSessionResponseDisposition disposition))completionHandler
+{
+    NSURLSessionResponseDisposition disposition = NSURLSessionResponseAllow;
+
+    if (self.dataTaskDidReceiveResponse) {
+        disposition = self.dataTaskDidReceiveResponse(session, dataTask, response);
+    }
+
+    if (completionHandler) {
+        completionHandler(disposition);
+    }
+}
+
+- (void)URLSession:(NSURLSession *)session
+          dataTask:(NSURLSessionDataTask *)dataTask
+didBecomeDownloadTask:(NSURLSessionDownloadTask *)downloadTask
+{
+    AFURLSessionManagerTaskDelegate *delegate = [self delegateForTask:dataTask];
+    if (delegate) {
+        [self removeDelegateForTask:dataTask];
+        [self setDelegate:delegate forTask:downloadTask];
+    }
+
+    if (self.dataTaskDidBecomeDownloadTask) {
+        self.dataTaskDidBecomeDownloadTask(session, dataTask, downloadTask);
+    }
+}
+
+- (void)URLSession:(NSURLSession *)session
+          dataTask:(NSURLSessionDataTask *)dataTask
+    didReceiveData:(NSData *)data
+{
+    AFURLSessionManagerTaskDelegate *delegate = [self delegateForTask:dataTask];
+    [delegate URLSession:session dataTask:dataTask didReceiveData:data];
+
+    if (self.dataTaskDidReceiveData) {
+        self.dataTaskDidReceiveData(session, dataTask, data);
+    }
+}
+
+- (void)URLSession:(NSURLSession *)session
+          dataTask:(NSURLSessionDataTask *)dataTask
+ willCacheResponse:(NSCachedURLResponse *)proposedResponse
+ completionHandler:(void (^)(NSCachedURLResponse *cachedResponse))completionHandler
+{
+    NSCachedURLResponse *cachedResponse = proposedResponse;
+
+    if (self.dataTaskWillCacheResponse) {
+        cachedResponse = self.dataTaskWillCacheResponse(session, dataTask, proposedResponse);
+    }
+
+    if (completionHandler) {
+        completionHandler(cachedResponse);
+    }
+}
+
+- (void)URLSessionDidFinishEventsForBackgroundURLSession:(NSURLSession *)session {
+    if (self.didFinishEventsForBackgroundURLSession) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            self.didFinishEventsForBackgroundURLSession(session);
+        });
+    }
+}
+
+#pragma mark - NSURLSessionDownloadDelegate
+
+- (void)URLSession:(NSURLSession *)session
+      downloadTask:(NSURLSessionDownloadTask *)downloadTask
+didFinishDownloadingToURL:(NSURL *)location
+{
+    AFURLSessionManagerTaskDelegate *delegate = [self delegateForTask:downloadTask];
+    if (self.downloadTaskDidFinishDownloading) {
+        NSURL *fileURL = self.downloadTaskDidFinishDownloading(session, downloadTask, location);
+        if (fileURL) {
+            delegate.downloadFileURL = fileURL;
+            NSError *error = nil;
+            [[NSFileManager defaultManager] moveItemAtURL:location toURL:fileURL error:&error];
+            if (error) {
+                [[NSNotificationCenter defaultCenter] postNotificationName:AFURLSessionDownloadTaskDidFailToMoveFileNotification object:downloadTask userInfo:error.userInfo];
+            }
+
+            return;
+        }
+    }
+    
+    if (delegate) {
+        [delegate URLSession:session downloadTask:downloadTask didFinishDownloadingToURL:location];
+    }
+}
+
+- (void)URLSession:(NSURLSession *)session
+      downloadTask:(NSURLSessionDownloadTask *)downloadTask
+      didWriteData:(int64_t)bytesWritten
+ totalBytesWritten:(int64_t)totalBytesWritten
+totalBytesExpectedToWrite:(int64_t)totalBytesExpectedToWrite
+{
+    AFURLSessionManagerTaskDelegate *delegate = [self delegateForTask:downloadTask];
+    [delegate URLSession:session downloadTask:downloadTask didWriteData:bytesWritten totalBytesWritten:totalBytesWritten totalBytesExpectedToWrite:totalBytesExpectedToWrite];
+
+    if (self.downloadTaskDidWriteData) {
+        self.downloadTaskDidWriteData(session, downloadTask, bytesWritten, totalBytesWritten, totalBytesExpectedToWrite);
+    }
+}
+
+- (void)URLSession:(NSURLSession *)session
+      downloadTask:(NSURLSessionDownloadTask *)downloadTask
+ didResumeAtOffset:(int64_t)fileOffset
+expectedTotalBytes:(int64_t)expectedTotalBytes
+{
+    AFURLSessionManagerTaskDelegate *delegate = [self delegateForTask:downloadTask];
+    [delegate URLSession:session downloadTask:downloadTask didResumeAtOffset:fileOffset expectedTotalBytes:expectedTotalBytes];
+
+    if (self.downloadTaskDidResume) {
+        self.downloadTaskDidResume(session, downloadTask, fileOffset, expectedTotalBytes);
+    }
+}
+
+#pragma mark - NSSecureCoding
+
++ (BOOL)supportsSecureCoding {
+    return YES;
+}
+
+- (id)initWithCoder:(NSCoder *)decoder {
+    NSURLSessionConfiguration *configuration = [decoder decodeObjectOfClass:[NSURLSessionConfiguration class] forKey:@"sessionConfiguration"];
+
+    self = [self initWithSessionConfiguration:configuration];
+    if (!self) {
+        return nil;
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+    [coder encodeObject:self.session.configuration forKey:@"sessionConfiguration"];
+}
+
+#pragma mark - NSCopying
+
+- (id)copyWithZone:(NSZone *)zone {
+    return [[[self class] allocWithZone:zone] initWithSessionConfiguration:self.session.configuration];
+}
+
+@end
+
+#endif
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/LICENSE b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/LICENSE
new file mode 100644
index 000000000..0616192d0
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com/)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/README.md b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/README.md
new file mode 100644
index 000000000..13e080c09
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/README.md
@@ -0,0 +1,383 @@
+<p align="center" >
+  <img src="https://raw.github.com/AFNetworking/AFNetworking/assets/afnetworking-logo.png" alt="AFNetworking" title="AFNetworking">
+</p>
+
+[![Build Status](https://travis-ci.org/AFNetworking/AFNetworking.svg)](https://travis-ci.org/AFNetworking/AFNetworking)
+
+AFNetworking is a delightful networking library for iOS and Mac OS X. It's built on top of the [Foundation URL Loading System](http://developer.apple.com/library/mac/#documentation/Cocoa/Conceptual/URLLoadingSystem/URLLoadingSystem.html), extending the powerful high-level networking abstractions built into Cocoa. It has a modular architecture with well-designed, feature-rich APIs that are a joy to use.
+
+Perhaps the most important feature of all, however, is the amazing community of developers who use and contribute to AFNetworking every day. AFNetworking powers some of the most popular and critically-acclaimed apps on the iPhone, iPad, and Mac.
+
+Choose AFNetworking for your next project, or migrate over your existing projects—you'll be happy you did!
+
+## How To Get Started
+
+- [Download AFNetworking](https://github.com/AFNetworking/AFNetworking/archive/master.zip) and try out the included Mac and iPhone example apps
+- Read the ["Getting Started" guide](https://github.com/AFNetworking/AFNetworking/wiki/Getting-Started-with-AFNetworking), [FAQ](https://github.com/AFNetworking/AFNetworking/wiki/AFNetworking-FAQ), or [other articles on the Wiki](https://github.com/AFNetworking/AFNetworking/wiki)
+- Check out the [documentation](http://cocoadocs.org/docsets/AFNetworking/) for a comprehensive look at all of the APIs available in AFNetworking
+- Read the [AFNetworking 2.0 Migration Guide](https://github.com/AFNetworking/AFNetworking/wiki/AFNetworking-2.0-Migration-Guide) for an overview of the architectural changes from 1.0.
+
+## Communication
+
+- If you **need help**, use [Stack Overflow](http://stackoverflow.com/questions/tagged/afnetworking). (Tag 'afnetworking')
+- If you'd like to **ask a general question**, use [Stack Overflow](http://stackoverflow.com/questions/tagged/afnetworking).
+- If you **found a bug**, _and can provide steps to reliably reproduce it_, open an issue.
+- If you **have a feature request**, open an issue.
+- If you **want to contribute**, submit a pull request.
+
+### Installation with CocoaPods
+
+[CocoaPods](http://cocoapods.org) is a dependency manager for Objective-C, which automates and simplifies the process of using 3rd-party libraries like AFNetworking in your projects. See the ["Getting Started" guide for more information](https://github.com/AFNetworking/AFNetworking/wiki/Getting-Started-with-AFNetworking).
+
+#### Podfile
+
+```ruby
+platform :ios, '7.0'
+pod "AFNetworking", "~> 2.0"
+```
+
+## Requirements
+
+| AFNetworking Version | Minimum iOS Target  | Minimum OS X Target  |                                   Notes                                   |
+|:--------------------:|:---------------------------:|:----------------------------:|:-------------------------------------------------------------------------:|
+|          2.x         |            iOS 6            |           OS X 10.8          | Xcode 5 is required. `AFHTTPSessionManager` requires iOS 7 or OS X 10.9. |
+|          [1.x](https://github.com/AFNetworking/AFNetworking/tree/1.x)         |            iOS 5            |         Mac OS X 10.7        |                                                                           |
+|        [0.10.x](https://github.com/AFNetworking/AFNetworking/tree/0.10.x)        |            iOS 4            |         Mac OS X 10.6        |                                                                           |
+
+(OS X projects must support [64-bit with modern Cocoa runtime](https://developer.apple.com/library/mac/#documentation/Cocoa/Conceptual/ObjCRuntimeGuide/Articles/ocrtVersionsPlatforms.html)).
+
+## Architecture
+
+### NSURLConnection
+
+- `AFURLConnectionOperation`
+- `AFHTTPRequestOperation`
+- `AFHTTPRequestOperationManager`
+
+### NSURLSession _(iOS 7 / Mac OS X 10.9)_
+
+- `AFURLSessionManager`
+- `AFHTTPSessionManager`
+
+### Serialization
+
+* `<AFURLRequestSerialization>`
+  - `AFHTTPRequestSerializer`
+  - `AFJSONRequestSerializer`
+  - `AFPropertyListRequestSerializer`
+* `<AFURLResponseSerialization>`
+  - `AFHTTPResponseSerializer`
+  - `AFJSONResponseSerializer`
+  - `AFXMLParserResponseSerializer`
+  - `AFXMLDocumentResponseSerializer` _(Mac OS X)_
+  - `AFPropertyListResponseSerializer`
+  - `AFImageResponseSerializer`
+  - `AFCompoundResponseSerializer`
+
+### Additional Functionality
+
+- `AFSecurityPolicy`
+- `AFNetworkReachabilityManager`
+
+## Usage
+
+### HTTP Request Operation Manager
+
+`AFHTTPRequestOperationManager` encapsulates the common patterns of communicating with a web application over HTTP, including request creation, response serialization, network reachability monitoring, and security, as well as request operation management.
+
+#### `GET` Request
+
+```objective-c
+AFHTTPRequestOperationManager *manager = [AFHTTPRequestOperationManager manager];
+[manager GET:@"http://example.com/resources.json" parameters:nil success:^(AFHTTPRequestOperation *operation, id responseObject) {
+    NSLog(@"JSON: %@", responseObject);
+} failure:^(AFHTTPRequestOperation *operation, NSError *error) {
+    NSLog(@"Error: %@", error);
+}];
+```
+
+#### `POST` URL-Form-Encoded Request
+
+```objective-c
+AFHTTPRequestOperationManager *manager = [AFHTTPRequestOperationManager manager];
+NSDictionary *parameters = @{@"foo": @"bar"};
+[manager POST:@"http://example.com/resources.json" parameters:parameters success:^(AFHTTPRequestOperation *operation, id responseObject) {
+    NSLog(@"JSON: %@", responseObject);
+} failure:^(AFHTTPRequestOperation *operation, NSError *error) {
+    NSLog(@"Error: %@", error);
+}];
+```
+
+#### `POST` Multi-Part Request
+
+```objective-c
+AFHTTPRequestOperationManager *manager = [AFHTTPRequestOperationManager manager];
+NSDictionary *parameters = @{@"foo": @"bar"};
+NSURL *filePath = [NSURL fileURLWithPath:@"file://path/to/image.png"];
+[manager POST:@"http://example.com/resources.json" parameters:parameters constructingBodyWithBlock:^(id<AFMultipartFormData> formData) {
+    [formData appendPartWithFileURL:filePath name:@"image" error:nil];
+} success:^(AFHTTPRequestOperation *operation, id responseObject) {
+    NSLog(@"Success: %@", responseObject);
+} failure:^(AFHTTPRequestOperation *operation, NSError *error) {
+    NSLog(@"Error: %@", error);
+}];
+```
+
+---
+
+### AFURLSessionManager
+
+`AFURLSessionManager` creates and manages an `NSURLSession` object based on a specified `NSURLSessionConfiguration` object, which conforms to `<NSURLSessionTaskDelegate>`, `<NSURLSessionDataDelegate>`, `<NSURLSessionDownloadDelegate>`, and `<NSURLSessionDelegate>`.
+
+#### Creating a Download Task
+
+```objective-c
+NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
+AFURLSessionManager *manager = [[AFURLSessionManager alloc] initWithSessionConfiguration:configuration];
+
+NSURL *URL = [NSURL URLWithString:@"http://example.com/download.zip"];
+NSURLRequest *request = [NSURLRequest requestWithURL:URL];
+
+NSURLSessionDownloadTask *downloadTask = [manager downloadTaskWithRequest:request progress:nil destination:^NSURL *(NSURL *targetPath, NSURLResponse *response) {
+    NSURL *documentsDirectoryURL = [[NSFileManager defaultManager] URLForDirectory:NSDocumentDirectory inDomain:NSUserDomainMask appropriateForURL:nil create:NO error:nil];
+    return [documentsDirectoryURL URLByAppendingPathComponent:[response suggestedFilename]];
+} completionHandler:^(NSURLResponse *response, NSURL *filePath, NSError *error) {
+    NSLog(@"File downloaded to: %@", filePath);
+}];
+[downloadTask resume];
+```
+
+#### Creating an Upload Task
+
+```objective-c
+NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
+AFURLSessionManager *manager = [[AFURLSessionManager alloc] initWithSessionConfiguration:configuration];
+
+NSURL *URL = [NSURL URLWithString:@"http://example.com/upload"];
+NSURLRequest *request = [NSURLRequest requestWithURL:URL];
+
+NSURL *filePath = [NSURL fileURLWithPath:@"file://path/to/image.png"];
+NSURLSessionUploadTask *uploadTask = [manager uploadTaskWithRequest:request fromFile:filePath progress:nil completionHandler:^(NSURLResponse *response, id responseObject, NSError *error) {
+    if (error) {
+        NSLog(@"Error: %@", error);
+    } else {
+        NSLog(@"Success: %@ %@", response, responseObject);
+    }
+}];
+[uploadTask resume];
+```
+
+#### Creating an Upload Task for a Multi-Part Request, with Progress
+
+```objective-c
+NSMutableURLRequest *request = [[AFHTTPRequestSerializer serializer] multipartFormRequestWithMethod:@"POST" URLString:@"http://example.com/upload" parameters:nil constructingBodyWithBlock:^(id<AFMultipartFormData> formData) {
+        [formData appendPartWithFileURL:[NSURL fileURLWithPath:@"file://path/to/image.jpg"] name:@"file" fileName:@"filename.jpg" mimeType:@"image/jpeg" error:nil];
+    } error:nil];
+
+AFURLSessionManager *manager = [[AFURLSessionManager alloc] initWithSessionConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]];
+NSProgress *progress = nil;
+
+NSURLSessionUploadTask *uploadTask = [manager uploadTaskWithStreamedRequest:request progress:&progress completionHandler:^(NSURLResponse *response, id responseObject, NSError *error) {
+    if (error) {
+        NSLog(@"Error: %@", error);
+    } else {
+        NSLog(@"%@ %@", response, responseObject);
+    }
+}];
+
+[uploadTask resume];
+```
+
+#### Creating a Data Task
+
+```objective-c
+NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
+AFURLSessionManager *manager = [[AFURLSessionManager alloc] initWithSessionConfiguration:configuration];
+
+NSURL *URL = [NSURL URLWithString:@"http://example.com/upload"];
+NSURLRequest *request = [NSURLRequest requestWithURL:URL];
+
+NSURLSessionDataTask *dataTask = [manager dataTaskWithRequest:request completionHandler:^(NSURLResponse *response, id responseObject, NSError *error) {
+    if (error) {
+        NSLog(@"Error: %@", error);
+    } else {
+        NSLog(@"%@ %@", response, responseObject);
+    }
+}];
+[dataTask resume];
+```
+
+---
+
+### Request Serialization
+
+Request serializers create requests from URL strings, encoding parameters as either a query string or HTTP body.
+
+```objective-c
+NSString *URLString = @"http://example.com";
+NSDictionary *parameters = @{@"foo": @"bar", @"baz": @[@1, @2, @3]};
+```
+
+#### Query String Parameter Encoding
+
+```objective-c
+[[AFHTTPRequestSerializer serializer] requestWithMethod:@"GET" URLString:URLString parameters:parameters error:nil];
+```
+
+    GET http://example.com?foo=bar&baz[]=1&baz[]=2&baz[]=3
+
+#### URL Form Parameter Encoding
+
+```objective-c
+[[AFHTTPRequestSerializer serializer] requestWithMethod:@"POST" URLString:URLString parameters:parameters];
+```
+
+    POST http://example.com/
+    Content-Type: application/x-www-form-urlencoded
+
+    foo=bar&baz[]=1&baz[]=2&baz[]=3
+
+#### JSON Parameter Encoding
+
+```objective-c
+[[AFJSONRequestSerializer serializer] requestWithMethod:@"POST" URLString:URLString parameters:parameters];
+```
+
+    POST http://example.com/
+    Content-Type: application/json
+
+    {"foo": "bar", "baz": [1,2,3]}
+
+---
+
+### Network Reachability Manager
+
+`AFNetworkReachabilityManager` monitors the reachability of domains, and addresses for both WWAN and WiFi network interfaces.
+
+#### Shared Network Reachability
+
+```objective-c
+[[AFNetworkReachabilityManager sharedManager] setReachabilityStatusChangeBlock:^(AFNetworkReachabilityStatus status) {
+    NSLog(@"Reachability: %@", AFStringFromNetworkReachabilityStatus(status));
+}];
+```
+
+#### HTTP Manager Reachability
+
+```objective-c
+NSURL *baseURL = [NSURL URLWithString:@"http://example.com/"];
+AFHTTPRequestOperationManager *manager = [[AFHTTPRequestOperationManager alloc] initWithBaseURL:baseURL];
+
+NSOperationQueue *operationQueue = manager.operationQueue;
+[manager.reachabilityManager setReachabilityStatusChangeBlock:^(AFNetworkReachabilityStatus status) {
+    switch (status) {
+        case AFNetworkReachabilityStatusReachableViaWWAN:
+        case AFNetworkReachabilityStatusReachableViaWiFi:
+            [operationQueue setSuspended:NO];
+            break;
+        case AFNetworkReachabilityStatusNotReachable:
+        default:
+            [operationQueue setSuspended:YES];
+            break;
+    }
+}];
+
+[manager.reachabilityManager startMonitoring];
+```
+
+---
+
+### Security Policy
+
+`AFSecurityPolicy` evaluates server trust against pinned X.509 certificates and public keys over secure connections.
+
+Adding pinned SSL certificates to your app helps prevent man-in-the-middle attacks and other vulnerabilities. Applications dealing with sensitive customer data or financial information are strongly encouraged to route all communication over an HTTPS connection with SSL pinning configured and enabled.
+
+#### Allowing Invalid SSL Certificates
+
+```objective-c
+AFHTTPRequestOperationManager *manager = [AFHTTPRequestOperationManager manager];
+manager.securityPolicy.allowInvalidCertificates = YES; // not recommended for production
+```
+
+---
+
+### AFHTTPRequestOperation
+
+`AFHTTPRequestOperation` is a subclass of `AFURLConnectionOperation` for requests using the HTTP or HTTPS protocols. It encapsulates the concept of acceptable status codes and content types, which determine the success or failure of a request.
+
+Although `AFHTTPRequestOperationManager` is usually the best way to go about making requests, `AFHTTPRequestOperation` can be used by itself.
+
+#### `GET` with `AFHTTPRequestOperation`
+
+```objective-c
+NSURL *URL = [NSURL URLWithString:@"http://example.com/resources/123.json"];
+NSURLRequest *request = [NSURLRequest requestWithURL:URL];
+AFHTTPRequestOperation *op = [[AFHTTPRequestOperation alloc] initWithRequest:request];
+op.responseSerializer = [AFJSONResponseSerializer serializer];
+[op setCompletionBlockWithSuccess:^(AFHTTPRequestOperation *operation, id responseObject) {
+    NSLog(@"JSON: %@", responseObject);
+} failure:^(AFHTTPRequestOperation *operation, NSError *error) {
+    NSLog(@"Error: %@", error);
+}];
+[[NSOperationQueue mainQueue] addOperation:op];
+```
+
+#### Batch of Operations
+
+```objective-c
+NSMutableArray *mutableOperations = [NSMutableArray array];
+for (NSURL *fileURL in filesToUpload) {
+    NSURLRequest *request = [[AFHTTPRequestSerializer serializer] multipartFormRequestWithMethod:@"POST" URLString:@"http://example.com/upload" parameters:nil constructingBodyWithBlock:^(id<AFMultipartFormData> formData) {
+        [formData appendPartWithFileURL:fileURL name:@"images[]" error:nil];
+    }];
+
+    AFHTTPRequestOperation *operation = [[AFHTTPRequestOperation alloc] initWithRequest:request];
+
+    [mutableOperations addObject:operation];
+}
+
+NSArray *operations = [AFURLConnectionOperation batchOfRequestOperations:@[...] progressBlock:^(NSUInteger numberOfFinishedOperations, NSUInteger totalNumberOfOperations) {
+    NSLog(@"%lu of %lu complete", numberOfFinishedOperations, totalNumberOfOperations);
+} completionBlock:^(NSArray *operations) {
+    NSLog(@"All operations in batch complete");
+}];
+[[NSOperationQueue mainQueue] addOperations:operations waitUntilFinished:NO];
+```
+
+## Unit Tests
+
+AFNetworking includes a suite of unit tests within the Tests subdirectory. In order to run the unit tests, you must install the testing dependencies via [CocoaPods](http://cocoapods.org/):
+
+    $ cd Tests
+    $ pod install
+
+Once testing dependencies are installed, you can execute the test suite via the 'iOS Tests' and 'OS X Tests' schemes within Xcode.
+
+### Running Tests from the Command Line
+
+Tests can also be run from the command line or within a continuous integration environment. The [`xcpretty`](https://github.com/mneorr/xcpretty) utility needs to be installed before running the tests from the command line:
+
+    $ gem install xcpretty
+
+Once `xcpretty` is installed, you can execute the suite via `rake test`.
+
+## Credits
+
+AFNetworking was originally created by [Scott Raymond](https://github.com/sco/) and [Mattt Thompson](https://github.com/mattt/) in the development of [Gowalla for iPhone](http://en.wikipedia.org/wiki/Gowalla).
+
+AFNetworking's logo was designed by [Alan Defibaugh](http://www.alandefibaugh.com/).
+
+And most of all, thanks to AFNetworking's [growing list of contributors](https://github.com/AFNetworking/AFNetworking/contributors).
+
+## Contact
+
+Follow AFNetworking on Twitter ([@AFNetworking](https://twitter.com/AFNetworking))
+
+### Maintainers
+
+- [Mattt Thompson](http://github.com/mattt) ([@mattt](https://twitter.com/mattt))
+
+## License
+
+AFNetworking is available under the MIT license. See the LICENSE file for more info.
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.h
new file mode 100644
index 000000000..312d680e0
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.h
@@ -0,0 +1,76 @@
+// AFNetworkActivityIndicatorManager.h
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import <Foundation/Foundation.h>
+
+#import <Availability.h>
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+
+#import <UIKit/UIKit.h>
+
+/**
+ `AFNetworkActivityIndicatorManager` manages the state of the network activity indicator in the status bar. When enabled, it will listen for notifications indicating that a network request operation has started or finished, and start or stop animating the indicator accordingly. The number of active requests is incremented and decremented much like a stack or a semaphore, and the activity indicator will animate so long as that number is greater than zero.
+
+ You should enable the shared instance of `AFNetworkActivityIndicatorManager` when your application finishes launching. In `AppDelegate application:didFinishLaunchingWithOptions:` you can do so with the following code:
+
+    [[AFNetworkActivityIndicatorManager sharedManager] setEnabled:YES];
+
+ By setting `isNetworkActivityIndicatorVisible` to `YES` for `sharedManager`, the network activity indicator will show and hide automatically as requests start and finish. You should not ever need to call `incrementActivityCount` or `decrementActivityCount` yourself.
+
+ See the Apple Human Interface Guidelines section about the Network Activity Indicator for more information:
+ http://developer.apple.com/library/iOS/#documentation/UserExperience/Conceptual/MobileHIG/UIElementGuidelines/UIElementGuidelines.html#//apple_ref/doc/uid/TP40006556-CH13-SW44
+ */
+@interface AFNetworkActivityIndicatorManager : NSObject
+
+/**
+ A Boolean value indicating whether the manager is enabled.
+
+ If YES, the manager will change status bar network activity indicator according to network operation notifications it receives. The default value is NO.
+ */
+@property (nonatomic, assign, getter = isEnabled) BOOL enabled;
+
+/**
+ A Boolean value indicating whether the network activity indicator is currently displayed in the status bar.
+ */
+@property (readonly, nonatomic, assign) BOOL isNetworkActivityIndicatorVisible;
+
+/**
+ Returns the shared network activity indicator manager object for the system.
+
+ @return The systemwide network activity indicator manager.
+ */
++ (instancetype)sharedManager;
+
+/**
+ Increments the number of active network requests. If this number was zero before incrementing, this will start animating the status bar network activity indicator.
+ */
+- (void)incrementActivityCount;
+
+/**
+ Decrements the number of active network requests. If this number becomes zero after decrementing, this will stop animating the status bar network activity indicator.
+ */
+- (void)decrementActivityCount;
+
+@end
+
+#endif
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.m
new file mode 100644
index 000000000..c2d855a59
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.m
@@ -0,0 +1,171 @@
+// AFNetworkActivityIndicatorManager.m
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import "AFNetworkActivityIndicatorManager.h"
+
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED)
+
+#import "AFHTTPRequestOperation.h"
+
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000
+#import "AFURLSessionManager.h"
+#endif
+
+static NSTimeInterval const kAFNetworkActivityIndicatorInvisibilityDelay = 0.17;
+
+static NSURLRequest * AFNetworkRequestFromNotification(NSNotification *notification) {
+    if ([[notification object] isKindOfClass:[AFURLConnectionOperation class]]) {
+        return [(AFURLConnectionOperation *)[notification object] request];
+    }
+
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000
+    if ([[notification object] respondsToSelector:@selector(originalRequest)]) {
+        return [(NSURLSessionTask *)[notification object] originalRequest];
+    }
+#endif
+
+    return nil;
+}
+
+@interface AFNetworkActivityIndicatorManager ()
+@property (readwrite, nonatomic, assign) NSInteger activityCount;
+@property (readwrite, nonatomic, strong) NSTimer *activityIndicatorVisibilityTimer;
+@property (readonly, nonatomic, getter = isNetworkActivityIndicatorVisible) BOOL networkActivityIndicatorVisible;
+
+- (void)updateNetworkActivityIndicatorVisibility;
+- (void)updateNetworkActivityIndicatorVisibilityDelayed;
+@end
+
+@implementation AFNetworkActivityIndicatorManager
+@dynamic networkActivityIndicatorVisible;
+
++ (instancetype)sharedManager {
+    static AFNetworkActivityIndicatorManager *_sharedManager = nil;
+    static dispatch_once_t oncePredicate;
+    dispatch_once(&oncePredicate, ^{
+        _sharedManager = [[self alloc] init];
+    });
+
+    return _sharedManager;
+}
+
++ (NSSet *)keyPathsForValuesAffectingIsNetworkActivityIndicatorVisible {
+    return [NSSet setWithObject:@"activityCount"];
+}
+
+- (id)init {
+    self = [super init];
+    if (!self) {
+        return nil;
+    }
+
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(networkRequestDidStart:) name:AFNetworkingOperationDidStartNotification object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(networkRequestDidFinish:) name:AFNetworkingOperationDidFinishNotification object:nil];
+
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(networkRequestDidStart:) name:AFNetworkingTaskDidResumeNotification object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(networkRequestDidFinish:) name:AFNetworkingTaskDidSuspendNotification object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(networkRequestDidFinish:) name:AFNetworkingTaskDidCompleteNotification object:nil];
+#endif
+
+    return self;
+}
+
+- (void)dealloc {
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+
+    [_activityIndicatorVisibilityTimer invalidate];
+}
+
+- (void)updateNetworkActivityIndicatorVisibilityDelayed {
+    if (self.enabled) {
+        // Delay hiding of activity indicator for a short interval, to avoid flickering
+        if (![self isNetworkActivityIndicatorVisible]) {
+            [self.activityIndicatorVisibilityTimer invalidate];
+            self.activityIndicatorVisibilityTimer = [NSTimer timerWithTimeInterval:kAFNetworkActivityIndicatorInvisibilityDelay target:self selector:@selector(updateNetworkActivityIndicatorVisibility) userInfo:nil repeats:NO];
+            [[NSRunLoop mainRunLoop] addTimer:self.activityIndicatorVisibilityTimer forMode:NSRunLoopCommonModes];
+        } else {
+            [self performSelectorOnMainThread:@selector(updateNetworkActivityIndicatorVisibility) withObject:nil waitUntilDone:NO modes:@[NSRunLoopCommonModes]];
+        }
+    }
+}
+
+- (BOOL)isNetworkActivityIndicatorVisible {
+    return self.activityCount > 0;
+}
+
+- (void)updateNetworkActivityIndicatorVisibility {
+    [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:[self isNetworkActivityIndicatorVisible]];
+}
+
+- (void)setActivityCount:(NSInteger)activityCount {
+	@synchronized(self) {
+		_activityCount = activityCount;
+	}
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [self updateNetworkActivityIndicatorVisibilityDelayed];
+    });
+}
+
+- (void)incrementActivityCount {
+    [self willChangeValueForKey:@"activityCount"];
+	@synchronized(self) {
+		_activityCount++;
+	}
+    [self didChangeValueForKey:@"activityCount"];
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [self updateNetworkActivityIndicatorVisibilityDelayed];
+    });
+}
+
+- (void)decrementActivityCount {
+    [self willChangeValueForKey:@"activityCount"];
+	@synchronized(self) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu"
+		_activityCount = MAX(_activityCount - 1, 0);
+#pragma clang diagnostic pop
+	}
+    [self didChangeValueForKey:@"activityCount"];
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [self updateNetworkActivityIndicatorVisibilityDelayed];
+    });
+}
+
+- (void)networkRequestDidStart:(NSNotification *)notification {
+    if ([AFNetworkRequestFromNotification(notification) URL]) {
+        [self incrementActivityCount];
+    }
+}
+
+- (void)networkRequestDidFinish:(NSNotification *)notification {
+    if ([AFNetworkRequestFromNotification(notification) URL]) {
+        [self decrementActivityCount];
+    }
+}
+
+@end
+
+#endif
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.h
new file mode 100644
index 000000000..1c1f8dd6f
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.h
@@ -0,0 +1,64 @@
+// UIActivityIndicatorView+AFNetworking.h
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import <Foundation/Foundation.h>
+
+#import <Availability.h>
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+
+#import <UIKit/UIKit.h>
+
+@class AFURLConnectionOperation;
+
+/**
+ This category adds methods to the UIKit framework's `UIActivityIndicatorView` class. The methods in this category provide support for automatically starting and stopping animation depending on the loading state of a request operation or session task.
+ */
+@interface UIActivityIndicatorView (AFNetworking)
+
+///----------------------------------
+/// @name Animating for Session Tasks
+///----------------------------------
+
+/**
+ Binds the animating state to the state of the specified task.
+
+ @param task The task. If `nil`, automatic updating from any previously specified operation will be disabled.
+ */
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000
+- (void)setAnimatingWithStateOfTask:(NSURLSessionTask *)task;
+#endif
+
+///---------------------------------------
+/// @name Animating for Request Operations
+///---------------------------------------
+
+/**
+ Binds the animating state to the execution state of the specified operation.
+ 
+ @param operation The operation. If `nil`, automatic updating from any previously specified operation will be disabled.
+ */
+- (void)setAnimatingWithStateOfOperation:(AFURLConnectionOperation *)operation;
+
+@end
+
+#endif
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.m
new file mode 100644
index 000000000..6627dbb1b
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.m
@@ -0,0 +1,97 @@
+// UIActivityIndicatorView+AFNetworking.m
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import "UIActivityIndicatorView+AFNetworking.h"
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+
+#import "AFHTTPRequestOperation.h"
+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000
+#import "AFURLSessionManager.h"
+#endif
+
+@implementation UIActivityIndicatorView (AFNetworking)
+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000
+- (void)setAnimatingWithStateOfTask:(NSURLSessionTask *)task {
+    NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
+
+    [notificationCenter removeObserver:self name:AFNetworkingTaskDidResumeNotification object:nil];
+    [notificationCenter removeObserver:self name:AFNetworkingTaskDidSuspendNotification object:nil];
+    [notificationCenter removeObserver:self name:AFNetworkingTaskDidCompleteNotification object:nil];
+
+    if (task) {
+        if (task.state != NSURLSessionTaskStateCompleted) {
+            if (task.state == NSURLSessionTaskStateRunning) {
+                [self startAnimating];
+            } else {
+                [self stopAnimating];
+            }
+
+            [notificationCenter addObserver:self selector:@selector(af_startAnimating) name:AFNetworkingTaskDidResumeNotification object:task];
+            [notificationCenter addObserver:self selector:@selector(af_stopAnimating) name:AFNetworkingTaskDidCompleteNotification object:task];
+            [notificationCenter addObserver:self selector:@selector(af_stopAnimating) name:AFNetworkingTaskDidSuspendNotification object:task];
+        }
+    }
+}
+#endif
+
+#pragma mark -
+
+- (void)setAnimatingWithStateOfOperation:(AFURLConnectionOperation *)operation {
+    NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
+
+    [notificationCenter removeObserver:self name:AFNetworkingOperationDidStartNotification object:nil];
+    [notificationCenter removeObserver:self name:AFNetworkingOperationDidFinishNotification object:nil];
+
+    if (operation) {
+        if (![operation isFinished]) {
+            if ([operation isExecuting]) {
+                [self startAnimating];
+            } else {
+                [self stopAnimating];
+            }
+
+            [notificationCenter addObserver:self selector:@selector(af_startAnimating) name:AFNetworkingOperationDidStartNotification object:operation];
+            [notificationCenter addObserver:self selector:@selector(af_stopAnimating) name:AFNetworkingOperationDidFinishNotification object:operation];
+        }
+    }
+}
+
+#pragma mark -
+
+- (void)af_startAnimating {
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [self startAnimating];
+    });
+}
+
+- (void)af_stopAnimating {
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [self stopAnimating];
+    });
+}
+
+@end
+
+#endif
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIAlertView+AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIAlertView+AFNetworking.h
new file mode 100644
index 000000000..b94f1cb8e
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIAlertView+AFNetworking.h
@@ -0,0 +1,96 @@
+// UIAlertView+AFNetworking.h
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import <Foundation/Foundation.h>
+
+#import <Availability.h>
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+
+#import <UIKit/UIKit.h>
+
+@class AFURLConnectionOperation;
+
+/**
+ This category adds methods to the UIKit framework's `UIAlertView` class. The methods in this category provide support for automatically showing an alert if a session task or request operation finishes with an error. Alert title and message are filled from the corresponding `localizedDescription` & `localizedRecoverySuggestion` or `localizedFailureReason` of the error.
+ */
+@interface UIAlertView (AFNetworking)
+
+///-------------------------------------
+/// @name Showing Alert for Session Task
+///-------------------------------------
+
+/**
+ Shows an alert view with the error of the specified session task, if any.
+ 
+ @param task The session task.
+ @param delegate The alert view delegate.
+ */
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000
++ (void)showAlertViewForTaskWithErrorOnCompletion:(NSURLSessionTask *)task
+                                         delegate:(id)delegate;
+#endif
+
+/**
+ Shows an alert view with the error of the specified session task, if any, with a custom cancel button title and other button titles.
+ 
+ @param task The session task.
+ @param delegate The alert view delegate.
+ @param cancelButtonTitle The title of the cancel button or nil if there is no cancel button. Using this argument is equivalent to setting the cancel button index to the value returned by invoking addButtonWithTitle: specifying this title.
+ @param otherButtonTitles The title of another button. Using this argument is equivalent to invoking addButtonWithTitle: with this title to add more buttons. Too many buttons can cause the alert view to scroll. For guidelines on the best ways to use an alert in an app, see "Temporary Views". Titles of additional buttons to add to the receiver, terminated with `nil`.
+ */
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000
++ (void)showAlertViewForTaskWithErrorOnCompletion:(NSURLSessionTask *)task
+                                         delegate:(id)delegate
+                                cancelButtonTitle:(NSString *)cancelButtonTitle
+                                otherButtonTitles:(NSString *)otherButtonTitles, ... NS_REQUIRES_NIL_TERMINATION;
+#endif
+
+///------------------------------------------
+/// @name Showing Alert for Request Operation
+///------------------------------------------
+
+/**
+ Shows an alert view with the error of the specified request operation, if any.
+
+ @param operation The request operation.
+ @param delegate The alert view delegate.
+ */
++ (void)showAlertViewForRequestOperationWithErrorOnCompletion:(AFURLConnectionOperation *)operation
+                                                     delegate:(id)delegate;
+
+/**
+ Shows an alert view with the error of the specified request operation, if any, with a custom cancel button title and other button titles.
+
+ @param operation The request operation.
+ @param delegate The alert view delegate.
+ @param cancelButtonTitle The title of the cancel button or nil if there is no cancel button. Using this argument is equivalent to setting the cancel button index to the value returned by invoking addButtonWithTitle: specifying this title.
+ @param otherButtonTitles The title of another button. Using this argument is equivalent to invoking addButtonWithTitle: with this title to add more buttons. Too many buttons can cause the alert view to scroll. For guidelines on the best ways to use an alert in an app, see "Temporary Views". Titles of additional buttons to add to the receiver, terminated with `nil`.
+ */
++ (void)showAlertViewForRequestOperationWithErrorOnCompletion:(AFURLConnectionOperation *)operation
+                                                     delegate:(id)delegate
+                                            cancelButtonTitle:(NSString *)cancelButtonTitle
+                                            otherButtonTitles:(NSString *)otherButtonTitles, ... NS_REQUIRES_NIL_TERMINATION;
+
+@end
+
+#endif
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIAlertView+AFNetworking.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIAlertView+AFNetworking.m
new file mode 100644
index 000000000..b7e2a26cb
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIAlertView+AFNetworking.m
@@ -0,0 +1,111 @@
+// UIAlertView+AFNetworking.m
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import "UIAlertView+AFNetworking.h"
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+
+#import "AFURLConnectionOperation.h"
+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000
+#import "AFURLSessionManager.h"
+#endif
+
+static void AFGetAlertViewTitleAndMessageFromError(NSError *error, NSString * __autoreleasing *title, NSString * __autoreleasing *message) {
+    if (error.localizedDescription && (error.localizedRecoverySuggestion || error.localizedFailureReason)) {
+        *title = error.localizedDescription;
+
+        if (error.localizedRecoverySuggestion) {
+            *message = error.localizedRecoverySuggestion;
+        } else {
+            *message = error.localizedFailureReason;
+        }
+    } else if (error.localizedDescription) {
+        *title = NSLocalizedStringFromTable(@"Error", @"AFNetworking", @"Fallback Error Description");
+        *message = error.localizedDescription;
+    } else {
+        *title = NSLocalizedStringFromTable(@"Error", @"AFNetworking", @"Fallback Error Description");
+        *message = [NSString stringWithFormat:NSLocalizedStringFromTable(@"%@ Error: %ld", @"AFNetworking", @"Fallback Error Failure Reason Format"), error.domain, (long)error.code];
+    }
+}
+
+@implementation UIAlertView (AFNetworking)
+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000
++ (void)showAlertViewForTaskWithErrorOnCompletion:(NSURLSessionTask *)task
+                                         delegate:(id)delegate
+{
+    [self showAlertViewForTaskWithErrorOnCompletion:task delegate:delegate cancelButtonTitle:NSLocalizedStringFromTable(@"Dismiss", @"AFNetworking", @"UIAlertView Cancel Button Title") otherButtonTitles:nil, nil];
+}
+
++ (void)showAlertViewForTaskWithErrorOnCompletion:(NSURLSessionTask *)task
+                                         delegate:(id)delegate
+                                cancelButtonTitle:(NSString *)cancelButtonTitle
+                                otherButtonTitles:(NSString *)otherButtonTitles, ... NS_REQUIRES_NIL_TERMINATION
+{
+    __block id observer = [[NSNotificationCenter defaultCenter] addObserverForName:AFNetworkingTaskDidCompleteNotification object:task queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notification) {
+
+        NSError *error = notification.userInfo[AFNetworkingTaskDidCompleteErrorKey];
+        if (error) {
+            NSString *title, *message;
+            AFGetAlertViewTitleAndMessageFromError(error, &title, &message);
+
+            [[[UIAlertView alloc] initWithTitle:title message:message delegate:delegate cancelButtonTitle:cancelButtonTitle otherButtonTitles:otherButtonTitles, nil] show];
+        }
+
+        [[NSNotificationCenter defaultCenter] removeObserver:observer name:AFNetworkingTaskDidCompleteNotification object:notification.object];
+    }];
+}
+#endif
+
+#pragma mark -
+
++ (void)showAlertViewForRequestOperationWithErrorOnCompletion:(AFURLConnectionOperation *)operation
+                                                     delegate:(id)delegate
+{
+    [self showAlertViewForRequestOperationWithErrorOnCompletion:operation delegate:delegate cancelButtonTitle:NSLocalizedStringFromTable(@"Dismiss", @"AFNetworking", @"UIAlert View Cancel Button Title") otherButtonTitles:nil, nil];
+}
+
++ (void)showAlertViewForRequestOperationWithErrorOnCompletion:(AFURLConnectionOperation *)operation
+                                                     delegate:(id)delegate
+                                            cancelButtonTitle:(NSString *)cancelButtonTitle
+                                            otherButtonTitles:(NSString *)otherButtonTitles, ... NS_REQUIRES_NIL_TERMINATION
+{
+    __block id observer = [[NSNotificationCenter defaultCenter] addObserverForName:AFNetworkingOperationDidFinishNotification object:operation queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notification) {
+
+        if (notification.object && [notification.object isKindOfClass:[AFURLConnectionOperation class]]) {
+            NSError *error = [(AFURLConnectionOperation *)notification.object error];
+            if (error) {
+                NSString *title, *message;
+                AFGetAlertViewTitleAndMessageFromError(error, &title, &message);
+
+                [[[UIAlertView alloc] initWithTitle:title message:message delegate:delegate cancelButtonTitle:cancelButtonTitle otherButtonTitles:otherButtonTitles, nil] show];
+            }
+        }
+
+        [[NSNotificationCenter defaultCenter] removeObserver:observer name:AFNetworkingOperationDidFinishNotification object:notification.object];
+    }];
+}
+
+@end
+
+#endif
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIButton+AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIButton+AFNetworking.h
new file mode 100644
index 000000000..e6ed6de04
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIButton+AFNetworking.h
@@ -0,0 +1,181 @@
+// UIButton+AFNetworking.h
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import <Foundation/Foundation.h>
+
+#import <Availability.h>
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+
+#import <UIKit/UIKit.h>
+
+@protocol AFURLResponseSerialization, AFImageCache;
+
+/**
+ This category adds methods to the UIKit framework's `UIButton` class. The methods in this category provide support for loading remote images and background images asynchronously from a URL.
+ 
+ @warning Compound values for control `state` (such as `UIControlStateHighlighted | UIControlStateDisabled`) are unsupported.
+ */
+@interface UIButton (AFNetworking)
+
+///----------------------------
+/// @name Accessing Image Cache
+///----------------------------
+
+/**
+ The image cache used to improve image loadiing performance on scroll views. By default, `UIButton` will use the `sharedImageCache` of `UIImageView`.
+ */
++ (id <AFImageCache>)sharedImageCache;
+
+/**
+ Set the cache used for image loading.
+
+ @param imageCache The image cache.
+ */
++ (void)setSharedImageCache:(id <AFImageCache>)imageCache;
+
+///------------------------------------
+/// @name Accessing Response Serializer
+///------------------------------------
+
+/**
+ The response serializer used to create an image representation from the server response and response data. By default, this is an instance of `AFImageResponseSerializer`.
+
+ @discussion Subclasses of `AFImageResponseSerializer` could be used to perform post-processing, such as color correction, face detection, or other effects. See https://github.com/AFNetworking/AFCoreImageSerializer
+ */
+@property (nonatomic, strong) id <AFURLResponseSerialization> imageResponseSerializer;
+
+///--------------------
+/// @name Setting Image
+///--------------------
+
+/**
+ Asynchronously downloads an image from the specified URL, and sets it as the image for the specified state once the request is finished. Any previous image request for the receiver will be cancelled.
+ 
+  If the image is cached locally, the image is set immediately, otherwise the specified placeholder image will be set immediately, and then the remote image will be set once the request is finished.
+ 
+ @param state The control state.
+ @param url The URL used for the image request.
+ */
+- (void)setImageForState:(UIControlState)state
+                 withURL:(NSURL *)url;
+
+/**
+ Asynchronously downloads an image from the specified URL, and sets it as the image for the specified state once the request is finished. Any previous image request for the receiver will be cancelled.
+ 
+ If the image is cached locally, the image is set immediately, otherwise the specified placeholder image will be set immediately, and then the remote image will be set once the request is finished.
+ 
+ @param state The control state.
+ @param url The URL used for the image request.
+ @param placeholderImage The image to be set initially, until the image request finishes. If `nil`, the button will not change its image until the image request finishes.
+ */
+- (void)setImageForState:(UIControlState)state
+                 withURL:(NSURL *)url
+        placeholderImage:(UIImage *)placeholderImage;
+
+/**
+ Asynchronously downloads an image from the specified URL request, and sets it as the image for the specified state once the request is finished. Any previous image request for the receiver will be cancelled.
+
+ If the image is cached locally, the image is set immediately, otherwise the specified placeholder image will be set immediately, and then the remote image will be set once the request is finished.
+ 
+ If a success block is specified, it is the responsibility of the block to set the image of the button before returning. If no success block is specified, the default behavior of setting the image with `setImage:forState:` is applied.
+
+ @param state The control state.
+ @param urlRequest The URL request used for the image request.
+ @param placeholderImage The image to be set initially, until the image request finishes. If `nil`, the button will not change its image until the image request finishes.
+ @param success A block to be executed when the image request operation finishes successfully. This block has no return value and takes two arguments: the server response and the image. If the image was returned from cache, the request and response parameters will be `nil`.
+ @param failure A block object to be executed when the image request operation finishes unsuccessfully, or that finishes successfully. This block has no return value and takes a single argument: the error that occurred.
+ */
+- (void)setImageForState:(UIControlState)state
+          withURLRequest:(NSURLRequest *)urlRequest
+        placeholderImage:(UIImage *)placeholderImage
+                 success:(void (^)(NSURLRequest *request, NSHTTPURLResponse *response, UIImage *image))success
+                 failure:(void (^)(NSError *error))failure;
+
+
+///-------------------------------
+/// @name Setting Background Image
+///-------------------------------
+
+/**
+ Asynchronously downloads an image from the specified URL, and sets it as the background image for the specified state once the request is finished. Any previous background image request for the receiver will be cancelled.
+
+ If the background image is cached locally, the background image is set immediately, otherwise the specified placeholder background image will be set immediately, and then the remote background image will be set once the request is finished.
+
+ @param state The control state.
+ @param url The URL used for the background image request.
+ */
+- (void)setBackgroundImageForState:(UIControlState)state
+                           withURL:(NSURL *)url;
+
+/**
+ Asynchronously downloads an image from the specified URL, and sets it as the background image for the specified state once the request is finished. Any previous image request for the receiver will be cancelled.
+
+ If the image is cached locally, the image is set immediately, otherwise the specified placeholder image will be set immediately, and then the remote image will be set once the request is finished.
+
+ @param state The control state.
+ @param url The URL used for the background image request.
+ @param placeholderImage The background image to be set initially, until the background image request finishes. If `nil`, the button will not change its background image until the background image request finishes.
+ */
+- (void)setBackgroundImageForState:(UIControlState)state
+                           withURL:(NSURL *)url
+                  placeholderImage:(UIImage *)placeholderImage;
+
+/**
+ Asynchronously downloads an image from the specified URL request, and sets it as the image for the specified state once the request is finished. Any previous image request for the receiver will be cancelled.
+
+ If the image is cached locally, the image is set immediately, otherwise the specified placeholder image will be set immediately, and then the remote image will be set once the request is finished.
+
+ If a success block is specified, it is the responsibility of the block to set the image of the button before returning. If no success block is specified, the default behavior of setting the image with `setBackgroundImage:forState:` is applied.
+
+ @param state The control state.
+ @param urlRequest The URL request used for the image request.
+ @param placeholderImage The background image to be set initially, until the background image request finishes. If `nil`, the button will not change its background image until the background image request finishes.
+ */
+- (void)setBackgroundImageForState:(UIControlState)state
+                    withURLRequest:(NSURLRequest *)urlRequest
+                  placeholderImage:(UIImage *)placeholderImage
+                           success:(void (^)(NSURLRequest *request, NSHTTPURLResponse *response, UIImage *image))success
+                           failure:(void (^)(NSError *error))failure;
+
+
+///------------------------------
+/// @name Canceling Image Loading
+///------------------------------
+
+/**
+ Cancels any executing image operation for the specified control state of the receiver, if one exists.
+ 
+ @param state The control state.
+ */
+- (void)cancelImageRequestOperationForState:(UIControlState)state;
+
+/**
+ Cancels any executing background image operation for the specified control state of the receiver, if one exists.
+ 
+ @param state The control state.
+ */
+- (void)cancelBackgroundImageRequestOperationForState:(UIControlState)state;
+
+@end
+
+#endif
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIButton+AFNetworking.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIButton+AFNetworking.m
new file mode 100644
index 000000000..a225290a2
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIButton+AFNetworking.m
@@ -0,0 +1,293 @@
+// UIButton+AFNetworking.m
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import "UIButton+AFNetworking.h"
+
+#import <objc/runtime.h>
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+
+#import "AFURLResponseSerialization.h"
+#import "AFHTTPRequestOperation.h"
+
+#import "UIImageView+AFNetworking.h"
+
+@interface UIButton (_AFNetworking)
+@end
+
+@implementation UIButton (_AFNetworking)
+
++ (NSOperationQueue *)af_sharedImageRequestOperationQueue {
+    static NSOperationQueue *_af_sharedImageRequestOperationQueue = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        _af_sharedImageRequestOperationQueue = [[NSOperationQueue alloc] init];
+        _af_sharedImageRequestOperationQueue.maxConcurrentOperationCount = NSOperationQueueDefaultMaxConcurrentOperationCount;
+    });
+
+    return _af_sharedImageRequestOperationQueue;
+}
+
+#pragma mark -
+
+static char AFImageRequestOperationNormal;
+static char AFImageRequestOperationHighlighted;
+static char AFImageRequestOperationSelected;
+static char AFImageRequestOperationDisabled;
+
+static const char * af_imageRequestOperationKeyForState(UIControlState state) {
+    switch (state) {
+        case UIControlStateHighlighted:
+            return &AFImageRequestOperationHighlighted;
+        case UIControlStateSelected:
+            return &AFImageRequestOperationSelected;
+        case UIControlStateDisabled:
+            return &AFImageRequestOperationDisabled;
+        case UIControlStateNormal:
+        default:
+            return &AFImageRequestOperationNormal;
+    }
+}
+
+- (AFHTTPRequestOperation *)af_imageRequestOperationForState:(UIControlState)state {
+    return (AFHTTPRequestOperation *)objc_getAssociatedObject(self, af_imageRequestOperationKeyForState(state));
+}
+
+- (void)af_setImageRequestOperation:(AFHTTPRequestOperation *)imageRequestOperation
+                           forState:(UIControlState)state
+{
+    objc_setAssociatedObject(self, af_imageRequestOperationKeyForState(state), imageRequestOperation, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+#pragma mark -
+
+static char AFBackgroundImageRequestOperationNormal;
+static char AFBackgroundImageRequestOperationHighlighted;
+static char AFBackgroundImageRequestOperationSelected;
+static char AFBackgroundImageRequestOperationDisabled;
+
+static const char * af_backgroundImageRequestOperationKeyForState(UIControlState state) {
+    switch (state) {
+        case UIControlStateHighlighted:
+            return &AFBackgroundImageRequestOperationHighlighted;
+        case UIControlStateSelected:
+            return &AFBackgroundImageRequestOperationSelected;
+        case UIControlStateDisabled:
+            return &AFBackgroundImageRequestOperationDisabled;
+        case UIControlStateNormal:
+        default:
+            return &AFBackgroundImageRequestOperationNormal;
+    }
+}
+
+- (AFHTTPRequestOperation *)af_backgroundImageRequestOperationForState:(UIControlState)state {
+    return (AFHTTPRequestOperation *)objc_getAssociatedObject(self, af_backgroundImageRequestOperationKeyForState(state));
+}
+
+- (void)af_setBackgroundImageRequestOperation:(AFHTTPRequestOperation *)imageRequestOperation
+                                     forState:(UIControlState)state
+{
+    objc_setAssociatedObject(self, af_backgroundImageRequestOperationKeyForState(state), imageRequestOperation, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+@end
+
+#pragma mark -
+
+@implementation UIButton (AFNetworking)
+
++ (id <AFImageCache>)sharedImageCache {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu"
+    return objc_getAssociatedObject(self, @selector(sharedImageCache)) ?: [UIImageView sharedImageCache];
+#pragma clang diagnostic pop
+}
+
++ (void)setSharedImageCache:(id <AFImageCache>)imageCache {
+    objc_setAssociatedObject(self, @selector(sharedImageCache), imageCache, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+#pragma mark -
+
+- (id <AFURLResponseSerialization>)imageResponseSerializer {
+    static id <AFURLResponseSerialization> _af_defaultImageResponseSerializer = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        _af_defaultImageResponseSerializer = [AFImageResponseSerializer serializer];
+    });
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu"
+    return objc_getAssociatedObject(self, @selector(imageResponseSerializer)) ?: _af_defaultImageResponseSerializer;
+#pragma clang diagnostic pop
+}
+
+- (void)setImageResponseSerializer:(id <AFURLResponseSerialization>)serializer {
+    objc_setAssociatedObject(self, @selector(imageResponseSerializer), serializer, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+#pragma mark -
+
+- (void)setImageForState:(UIControlState)state
+                 withURL:(NSURL *)url
+{
+    [self setImageForState:state withURL:url placeholderImage:nil];
+}
+
+- (void)setImageForState:(UIControlState)state
+                 withURL:(NSURL *)url
+        placeholderImage:(UIImage *)placeholderImage
+{
+    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url];
+    [request addValue:@"image/*" forHTTPHeaderField:@"Accept"];
+
+    [self setImageForState:state withURLRequest:request placeholderImage:placeholderImage success:nil failure:nil];
+}
+
+- (void)setImageForState:(UIControlState)state
+          withURLRequest:(NSURLRequest *)urlRequest
+        placeholderImage:(UIImage *)placeholderImage
+                 success:(void (^)(NSURLRequest *request, NSHTTPURLResponse *response, UIImage *image))success
+                 failure:(void (^)(NSError *error))failure
+{
+    [self cancelImageRequestOperationForState:state];
+
+    UIImage *cachedImage = [[[self class] sharedImageCache] cachedImageForRequest:urlRequest];
+    if (cachedImage) {
+        if (success) {
+            success(nil, nil, cachedImage);
+        } else {
+            [self setImage:cachedImage forState:state];
+        }
+
+        [self af_setImageRequestOperation:nil forState:state];
+    } else {
+        if (placeholderImage) {
+            [self setImage:placeholderImage forState:state];
+        }
+
+        __weak __typeof(self)weakSelf = self;
+        AFHTTPRequestOperation *imageRequestOperation = [[AFHTTPRequestOperation alloc] initWithRequest:urlRequest];
+        imageRequestOperation.responseSerializer = self.imageResponseSerializer;
+        [imageRequestOperation setCompletionBlockWithSuccess:^(AFHTTPRequestOperation *operation, id responseObject) {
+            __strong __typeof(weakSelf)strongSelf = weakSelf;
+            if ([[urlRequest URL] isEqual:[operation.request URL]]) {
+                if (success) {
+                    success(operation.request, operation.response, responseObject);
+                } else if (responseObject) {
+                    [strongSelf setImage:responseObject forState:state];
+                }
+            }
+            [[[strongSelf class] sharedImageCache] cacheImage:responseObject forRequest:urlRequest];
+        } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
+            if ([[urlRequest URL] isEqual:[operation.response URL]]) {
+                if (failure) {
+                    failure(error);
+                }
+            }
+        }];
+
+        [self af_setImageRequestOperation:imageRequestOperation forState:state];
+        [[[self class] af_sharedImageRequestOperationQueue] addOperation:imageRequestOperation];
+    }
+}
+
+#pragma mark -
+
+- (void)setBackgroundImageForState:(UIControlState)state
+                           withURL:(NSURL *)url
+{
+    [self setBackgroundImageForState:state withURL:url placeholderImage:nil];
+}
+
+- (void)setBackgroundImageForState:(UIControlState)state
+                           withURL:(NSURL *)url
+                  placeholderImage:(UIImage *)placeholderImage
+{
+    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url];
+    [request addValue:@"image/*" forHTTPHeaderField:@"Accept"];
+
+    [self setBackgroundImageForState:state withURLRequest:request placeholderImage:placeholderImage success:nil failure:nil];
+}
+
+- (void)setBackgroundImageForState:(UIControlState)state
+                    withURLRequest:(NSURLRequest *)urlRequest
+                  placeholderImage:(UIImage *)placeholderImage
+                           success:(void (^)(NSURLRequest *request, NSHTTPURLResponse *response, UIImage *image))success
+                           failure:(void (^)(NSError *error))failure
+{
+    [self cancelBackgroundImageRequestOperationForState:state];
+
+    UIImage *cachedImage = [[[self class] sharedImageCache] cachedImageForRequest:urlRequest];
+    if (cachedImage) {
+        if (success) {
+            success(nil, nil, cachedImage);
+        } else {
+            [self setBackgroundImage:cachedImage forState:state];
+        }
+
+        [self af_setBackgroundImageRequestOperation:nil forState:state];
+    } else {
+        if (placeholderImage) {
+            [self setBackgroundImage:placeholderImage forState:state];
+        }
+
+        __weak __typeof(self)weakSelf = self;
+        AFHTTPRequestOperation *backgroundImageRequestOperation = [[AFHTTPRequestOperation alloc] initWithRequest:urlRequest];
+        backgroundImageRequestOperation.responseSerializer = self.imageResponseSerializer;
+        [backgroundImageRequestOperation setCompletionBlockWithSuccess:^(AFHTTPRequestOperation *operation, id responseObject) {
+            __strong __typeof(weakSelf)strongSelf = weakSelf;
+            if ([[urlRequest URL] isEqual:[operation.request URL]]) {
+                if (success) {
+                    success(operation.request, operation.response, responseObject);
+                } else if (responseObject) {
+                    [strongSelf setBackgroundImage:responseObject forState:state];
+                }
+            }
+        } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
+            if ([[urlRequest URL] isEqual:[operation.response URL]]) {
+                if (failure) {
+                    failure(error);
+                }
+            }
+        }];
+
+        [self af_setBackgroundImageRequestOperation:backgroundImageRequestOperation forState:state];
+        [[[self class] af_sharedImageRequestOperationQueue] addOperation:backgroundImageRequestOperation];
+    }
+}
+
+#pragma mark -
+
+- (void)cancelImageRequestOperationForState:(UIControlState)state {
+    [[self af_imageRequestOperationForState:state] cancel];
+    [self af_setImageRequestOperation:nil forState:state];
+}
+
+- (void)cancelBackgroundImageRequestOperationForState:(UIControlState)state {
+    [[self af_backgroundImageRequestOperationForState:state] cancel];
+    [self af_setBackgroundImageRequestOperation:nil forState:state];
+}
+
+@end
+
+#endif
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIImageView+AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIImageView+AFNetworking.h
new file mode 100644
index 000000000..5d523636e
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIImageView+AFNetworking.h
@@ -0,0 +1,143 @@
+// UIImageView+AFNetworking.h
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import <Foundation/Foundation.h>
+
+#import <Availability.h>
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+
+#import <UIKit/UIKit.h>
+
+@protocol AFURLResponseSerialization, AFImageCache;
+
+/**
+ This category adds methods to the UIKit framework's `UIImageView` class. The methods in this category provide support for loading remote images asynchronously from a URL.
+ */
+@interface UIImageView (AFNetworking)
+
+///----------------------------
+/// @name Accessing Image Cache
+///----------------------------
+
+/**
+ The image cache used to improve image loadiing performance on scroll views. By default, this is an `NSCache` subclass conforming to the `AFImageCache` protocol, which listens for notification warnings and evicts objects accordingly.
+*/
++ (id <AFImageCache>)sharedImageCache;
+
+/**
+ Set the cache used for image loading.
+ 
+ @param imageCache The image cache.
+ */
++ (void)setSharedImageCache:(id <AFImageCache>)imageCache;
+
+///------------------------------------
+/// @name Accessing Response Serializer
+///------------------------------------
+
+/**
+ The response serializer used to create an image representation from the server response and response data. By default, this is an instance of `AFImageResponseSerializer`.
+ 
+ @discussion Subclasses of `AFImageResponseSerializer` could be used to perform post-processing, such as color correction, face detection, or other effects. See https://github.com/AFNetworking/AFCoreImageSerializer
+ */
+@property (nonatomic, strong) id <AFURLResponseSerialization> imageResponseSerializer;
+
+///--------------------
+/// @name Setting Image
+///--------------------
+
+/**
+ Asynchronously downloads an image from the specified URL, and sets it once the request is finished. Any previous image request for the receiver will be cancelled. 
+ 
+ If the image is cached locally, the image is set immediately, otherwise the specified placeholder image will be set immediately, and then the remote image will be set once the request is finished.
+
+ By default, URL requests have a `Accept` header field value of "image / *", a cache policy of `NSURLCacheStorageAllowed` and a timeout interval of 30 seconds, and are set not handle cookies. To configure URL requests differently, use `setImageWithURLRequest:placeholderImage:success:failure:`
+
+ @param url The URL used for the image request.
+ */
+- (void)setImageWithURL:(NSURL *)url;
+
+/**
+ Asynchronously downloads an image from the specified URL, and sets it once the request is finished. Any previous image request for the receiver will be cancelled. 
+ 
+ If the image is cached locally, the image is set immediately, otherwise the specified placeholder image will be set immediately, and then the remote image will be set once the request is finished.
+
+ By default, URL requests have a `Accept` header field value of "image / *", a cache policy of `NSURLCacheStorageAllowed` and a timeout interval of 30 seconds, and are set not handle cookies. To configure URL requests differently, use `setImageWithURLRequest:placeholderImage:success:failure:`
+
+ @param url The URL used for the image request.
+ @param placeholderImage The image to be set initially, until the image request finishes. If `nil`, the image view will not change its image until the image request finishes.
+ */
+- (void)setImageWithURL:(NSURL *)url
+       placeholderImage:(UIImage *)placeholderImage;
+
+/**
+ Asynchronously downloads an image from the specified URL request, and sets it once the request is finished. Any previous image request for the receiver will be cancelled. 
+ 
+ If the image is cached locally, the image is set immediately, otherwise the specified placeholder image will be set immediately, and then the remote image will be set once the request is finished.
+ 
+ If a success block is specified, it is the responsibility of the block to set the image of the image view before returning. If no success block is specified, the default behavior of setting the image with `self.image = image` is applied.
+
+ @param urlRequest The URL request used for the image request.
+ @param placeholderImage The image to be set initially, until the image request finishes. If `nil`, the image view will not change its image until the image request finishes.
+ @param success A block to be executed when the image request operation finishes successfully. This block has no return value and takes three arguments: the request sent from the client, the response received from the server, and the image created from the response data of request. If the image was returned from cache, the request and response parameters will be `nil`.
+ @param failure A block object to be executed when the image request operation finishes unsuccessfully, or that finishes successfully. This block has no return value and takes three arguments: the request sent from the client, the response received from the server, and the error object describing the network or parsing error that occurred.
+ */
+- (void)setImageWithURLRequest:(NSURLRequest *)urlRequest
+              placeholderImage:(UIImage *)placeholderImage
+                       success:(void (^)(NSURLRequest *request, NSHTTPURLResponse *response, UIImage *image))success
+                       failure:(void (^)(NSURLRequest *request, NSHTTPURLResponse *response, NSError *error))failure;
+
+/**
+ Cancels any executing image operation for the receiver, if one exists.
+ */
+- (void)cancelImageRequestOperation;
+
+@end
+
+#pragma mark -
+
+/**
+ The `AFImageCache` protocol is adopted by an object used to cache images loaded by the AFNetworking category on `UIImageView`.
+ */
+@protocol AFImageCache <NSObject>
+
+/**
+ Returns a cached image for the specififed request, if available.
+ 
+ @param request The image request.
+ 
+ @return The cached image.
+ */
+- (UIImage *)cachedImageForRequest:(NSURLRequest *)request;
+
+/**
+ Caches a particular image for the specified request.
+ 
+ @param image The image to cache.
+ @param request The request to be used as a cache key.
+ */
+- (void)cacheImage:(UIImage *)image
+        forRequest:(NSURLRequest *)request;
+@end
+
+#endif
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIImageView+AFNetworking.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIImageView+AFNetworking.m
new file mode 100644
index 000000000..c06aa9ca4
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIImageView+AFNetworking.m
@@ -0,0 +1,216 @@
+// UIImageView+AFNetworking.m
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import "UIImageView+AFNetworking.h"
+
+#import <objc/runtime.h>
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+
+#import "AFHTTPRequestOperation.h"
+
+@interface AFImageCache : NSCache <AFImageCache>
+@end
+
+#pragma mark -
+
+@interface UIImageView (_AFNetworking)
+@property (readwrite, nonatomic, strong, setter = af_setImageRequestOperation:) AFHTTPRequestOperation *af_imageRequestOperation;
+@end
+
+@implementation UIImageView (_AFNetworking)
+
++ (NSOperationQueue *)af_sharedImageRequestOperationQueue {
+    static NSOperationQueue *_af_sharedImageRequestOperationQueue = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        _af_sharedImageRequestOperationQueue = [[NSOperationQueue alloc] init];
+        _af_sharedImageRequestOperationQueue.maxConcurrentOperationCount = NSOperationQueueDefaultMaxConcurrentOperationCount;
+    });
+
+    return _af_sharedImageRequestOperationQueue;
+}
+
+- (AFHTTPRequestOperation *)af_imageRequestOperation {
+    return (AFHTTPRequestOperation *)objc_getAssociatedObject(self, @selector(af_imageRequestOperation));
+}
+
+- (void)af_setImageRequestOperation:(AFHTTPRequestOperation *)imageRequestOperation {
+    objc_setAssociatedObject(self, @selector(af_imageRequestOperation), imageRequestOperation, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+@end
+
+#pragma mark -
+
+@implementation UIImageView (AFNetworking)
+@dynamic imageResponseSerializer;
+
++ (id <AFImageCache>)sharedImageCache {
+    static AFImageCache *_af_defaultImageCache = nil;
+    static dispatch_once_t oncePredicate;
+    dispatch_once(&oncePredicate, ^{
+        _af_defaultImageCache = [[AFImageCache alloc] init];
+
+        [[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationDidReceiveMemoryWarningNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification * __unused notification) {
+            [_af_defaultImageCache removeAllObjects];
+        }];
+    });
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu"
+    return objc_getAssociatedObject(self, @selector(sharedImageCache)) ?: _af_defaultImageCache;
+#pragma clang diagnostic pop
+}
+
++ (void)setSharedImageCache:(id <AFImageCache>)imageCache {
+    objc_setAssociatedObject(self, @selector(sharedImageCache), imageCache, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+#pragma mark -
+
+- (id <AFURLResponseSerialization>)imageResponseSerializer {
+    static id <AFURLResponseSerialization> _af_defaultImageResponseSerializer = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        _af_defaultImageResponseSerializer = [AFImageResponseSerializer serializer];
+    });
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu"
+    return objc_getAssociatedObject(self, @selector(imageResponseSerializer)) ?: _af_defaultImageResponseSerializer;
+#pragma clang diagnostic pop
+}
+
+- (void)setImageResponseSerializer:(id <AFURLResponseSerialization>)serializer {
+    objc_setAssociatedObject(self, @selector(imageResponseSerializer), serializer, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+#pragma mark -
+
+- (void)setImageWithURL:(NSURL *)url {
+    [self setImageWithURL:url placeholderImage:nil];
+}
+
+- (void)setImageWithURL:(NSURL *)url
+       placeholderImage:(UIImage *)placeholderImage
+{
+    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url];
+    [request addValue:@"image/*" forHTTPHeaderField:@"Accept"];
+
+    [self setImageWithURLRequest:request placeholderImage:placeholderImage success:nil failure:nil];
+}
+
+- (void)setImageWithURLRequest:(NSURLRequest *)urlRequest
+              placeholderImage:(UIImage *)placeholderImage
+                       success:(void (^)(NSURLRequest *request, NSHTTPURLResponse *response, UIImage *image))success
+                       failure:(void (^)(NSURLRequest *request, NSHTTPURLResponse *response, NSError *error))failure
+{
+    [self cancelImageRequestOperation];
+
+    UIImage *cachedImage = [[[self class] sharedImageCache] cachedImageForRequest:urlRequest];
+    if (cachedImage) {
+        if (success) {
+            success(nil, nil, cachedImage);
+        } else {
+            self.image = cachedImage;
+        }
+
+        self.af_imageRequestOperation = nil;
+    } else {
+        if (placeholderImage) {
+            self.image = placeholderImage;
+        }
+        
+        __weak __typeof(self)weakSelf = self;
+        self.af_imageRequestOperation = [[AFHTTPRequestOperation alloc] initWithRequest:urlRequest];
+        self.af_imageRequestOperation.responseSerializer = self.imageResponseSerializer;
+        [self.af_imageRequestOperation setCompletionBlockWithSuccess:^(AFHTTPRequestOperation *operation, id responseObject) {
+            __strong __typeof(weakSelf)strongSelf = weakSelf;
+            if ([[urlRequest URL] isEqual:[strongSelf.af_imageRequestOperation.request URL]]) {
+                if (success) {
+                    success(urlRequest, operation.response, responseObject);
+                } else if (responseObject) {
+                    strongSelf.image = responseObject;
+                }
+
+                if (operation == strongSelf.af_imageRequestOperation){
+                        strongSelf.af_imageRequestOperation = nil;
+                }
+            }
+
+            [[[strongSelf class] sharedImageCache] cacheImage:responseObject forRequest:urlRequest];
+        } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
+            __strong __typeof(weakSelf)strongSelf = weakSelf;
+            if ([[urlRequest URL] isEqual:[strongSelf.af_imageRequestOperation.request URL]]) {
+                if (failure) {
+                    failure(urlRequest, operation.response, error);
+                }
+
+                if (operation == strongSelf.af_imageRequestOperation){
+                        strongSelf.af_imageRequestOperation = nil;
+                }
+            }
+        }];
+
+        [[[self class] af_sharedImageRequestOperationQueue] addOperation:self.af_imageRequestOperation];
+    }
+}
+
+- (void)cancelImageRequestOperation {
+    [self.af_imageRequestOperation cancel];
+    self.af_imageRequestOperation = nil;
+}
+
+@end
+
+#pragma mark -
+
+static inline NSString * AFImageCacheKeyFromURLRequest(NSURLRequest *request) {
+    return [[request URL] absoluteString];
+}
+
+@implementation AFImageCache
+
+- (UIImage *)cachedImageForRequest:(NSURLRequest *)request {
+    switch ([request cachePolicy]) {
+        case NSURLRequestReloadIgnoringCacheData:
+        case NSURLRequestReloadIgnoringLocalAndRemoteCacheData:
+            return nil;
+        default:
+            break;
+    }
+
+	return [self objectForKey:AFImageCacheKeyFromURLRequest(request)];
+}
+
+- (void)cacheImage:(UIImage *)image
+        forRequest:(NSURLRequest *)request
+{
+    if (image && request) {
+        [self setObject:image forKey:AFImageCacheKeyFromURLRequest(request)];
+    }
+}
+
+@end
+
+#endif
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIKit+AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIKit+AFNetworking.h
new file mode 100644
index 000000000..94082f6cb
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIKit+AFNetworking.h
@@ -0,0 +1,38 @@
+// UIKit+AFNetworking.h
+//
+// Copyright (c) 2013 AFNetworking (http://afnetworking.com/)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import <UIKit/UIKit.h>
+
+#ifndef _UIKIT_AFNETWORKING_
+    #define _UIKIT_AFNETWORKING_
+
+    #import "AFNetworkActivityIndicatorManager.h"
+
+    #import "UIActivityIndicatorView+AFNetworking.h"
+    #import "UIAlertView+AFNetworking.h"
+    #import "UIButton+AFNetworking.h"
+    #import "UIImageView+AFNetworking.h"
+    #import "UIKit+AFNetworking.h"
+    #import "UIProgressView+AFNetworking.h"
+    #import "UIRefreshControl+AFNetworking.h"
+    #import "UIWebView+AFNetworking.h"
+#endif /* _UIKIT_AFNETWORKING_ */
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIProgressView+AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIProgressView+AFNetworking.h
new file mode 100644
index 000000000..3f1bc086f
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIProgressView+AFNetworking.h
@@ -0,0 +1,88 @@
+// UIProgressView+AFNetworking.h
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import <Foundation/Foundation.h>
+
+#import <Availability.h>
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+
+#import <UIKit/UIKit.h>
+
+@class AFURLConnectionOperation;
+
+/**
+ This category adds methods to the UIKit framework's `UIProgressView` class. The methods in this category provide support for binding the progress to the upload and download progress of a session task or request operation.
+ */
+@interface UIProgressView (AFNetworking)
+
+///------------------------------------
+/// @name Setting Session Task Progress
+///------------------------------------
+
+/**
+ Binds the progress to the upload progress of the specified session task.
+ 
+ @param task The session task.
+ @param animated `YES` if the change should be animated, `NO` if the change should happen immediately.
+ */
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000
+- (void)setProgressWithUploadProgressOfTask:(NSURLSessionUploadTask *)task
+                                   animated:(BOOL)animated;
+#endif
+
+/**
+ Binds the progress to the download progress of the specified session task.
+
+ @param task The session task.
+ @param animated `YES` if the change should be animated, `NO` if the change should happen immediately.
+ */
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000
+- (void)setProgressWithDownloadProgressOfTask:(NSURLSessionDownloadTask *)task
+                                     animated:(BOOL)animated;
+#endif
+
+///------------------------------------
+/// @name Setting Session Task Progress
+///------------------------------------
+
+/**
+ Binds the progress to the upload progress of the specified request operation.
+
+ @param operation The request operation.
+ @param animated `YES` if the change should be animated, `NO` if the change should happen immediately.
+ */
+- (void)setProgressWithUploadProgressOfOperation:(AFURLConnectionOperation *)operation
+                                        animated:(BOOL)animated;
+
+/**
+ Binds the progress to the download progress of the specified request operation.
+
+ @param operation The request operation.
+ @param animated `YES` if the change should be animated, `NO` if the change should happen immediately.
+ */
+- (void)setProgressWithDownloadProgressOfOperation:(AFURLConnectionOperation *)operation
+                                          animated:(BOOL)animated;
+
+@end
+
+#endif
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIProgressView+AFNetworking.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIProgressView+AFNetworking.m
new file mode 100644
index 000000000..927f56d84
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIProgressView+AFNetworking.m
@@ -0,0 +1,183 @@
+// UIProgressView+AFNetworking.m
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import "UIProgressView+AFNetworking.h"
+
+#import <objc/runtime.h>
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+
+#import "AFURLConnectionOperation.h"
+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000
+#import "AFURLSessionManager.h"
+#endif
+
+static void * AFTaskCountOfBytesSentContext = &AFTaskCountOfBytesSentContext;
+static void * AFTaskCountOfBytesReceivedContext = &AFTaskCountOfBytesReceivedContext;
+
+@interface AFURLConnectionOperation (_UIProgressView)
+@property (readwrite, nonatomic, copy) void (^uploadProgress)(NSUInteger bytes, long long totalBytes, long long totalBytesExpected);
+@property (readwrite, nonatomic, assign, setter = af_setUploadProgressAnimated:) BOOL af_uploadProgressAnimated;
+
+@property (readwrite, nonatomic, copy) void (^downloadProgress)(NSUInteger bytes, long long totalBytes, long long totalBytesExpected);
+@property (readwrite, nonatomic, assign, setter = af_setDownloadProgressAnimated:) BOOL af_downloadProgressAnimated;
+@end
+
+@implementation AFURLConnectionOperation (_UIProgressView)
+@dynamic uploadProgress; // Implemented in AFURLConnectionOperation
+@dynamic af_uploadProgressAnimated;
+
+@dynamic downloadProgress; // Implemented in AFURLConnectionOperation
+@dynamic af_downloadProgressAnimated;
+@end
+
+#pragma mark -
+
+@implementation UIProgressView (AFNetworking)
+
+- (BOOL)af_uploadProgressAnimated {
+    return [(NSNumber *)objc_getAssociatedObject(self, @selector(af_uploadProgressAnimated)) boolValue];
+}
+
+- (void)af_setUploadProgressAnimated:(BOOL)animated {
+    objc_setAssociatedObject(self, @selector(af_uploadProgressAnimated), @(animated), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+- (BOOL)af_downloadProgressAnimated {
+    return [(NSNumber *)objc_getAssociatedObject(self, @selector(af_downloadProgressAnimated)) boolValue];
+}
+
+- (void)af_setDownloadProgressAnimated:(BOOL)animated {
+    objc_setAssociatedObject(self, @selector(af_downloadProgressAnimated), @(animated), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+#pragma mark -
+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000
+- (void)setProgressWithUploadProgressOfTask:(NSURLSessionUploadTask *)task
+                                   animated:(BOOL)animated
+{
+    [task addObserver:self forKeyPath:@"state" options:(NSKeyValueObservingOptions)0 context:AFTaskCountOfBytesSentContext];
+    [task addObserver:self forKeyPath:@"countOfBytesSent" options:(NSKeyValueObservingOptions)0 context:AFTaskCountOfBytesSentContext];
+
+    [self af_setUploadProgressAnimated:animated];
+}
+
+- (void)setProgressWithDownloadProgressOfTask:(NSURLSessionDownloadTask *)task
+                                     animated:(BOOL)animated
+{
+    [task addObserver:self forKeyPath:@"state" options:(NSKeyValueObservingOptions)0 context:AFTaskCountOfBytesReceivedContext];
+    [task addObserver:self forKeyPath:@"countOfBytesReceived" options:(NSKeyValueObservingOptions)0 context:AFTaskCountOfBytesReceivedContext];
+
+    [self af_setDownloadProgressAnimated:animated];
+}
+#endif
+
+#pragma mark -
+
+- (void)setProgressWithUploadProgressOfOperation:(AFURLConnectionOperation *)operation
+                                        animated:(BOOL)animated
+{
+    __weak __typeof(self)weakSelf = self;
+    void (^original)(NSUInteger bytesWritten, long long totalBytesWritten, long long totalBytesExpectedToWrite) = [operation.uploadProgress copy];
+    [operation setUploadProgressBlock:^(NSUInteger bytesWritten, long long totalBytesWritten, long long totalBytesExpectedToWrite) {
+        if (original) {
+            original(bytesWritten, totalBytesWritten, totalBytesExpectedToWrite);
+        }
+
+        dispatch_async(dispatch_get_main_queue(), ^{
+            if (totalBytesExpectedToWrite > 0) {
+                __strong __typeof(weakSelf)strongSelf = weakSelf;
+                [strongSelf setProgress:(totalBytesWritten / (totalBytesExpectedToWrite * 1.0f)) animated:animated];
+            }
+        });
+    }];
+}
+
+- (void)setProgressWithDownloadProgressOfOperation:(AFURLConnectionOperation *)operation
+                                          animated:(BOOL)animated
+{
+    __weak __typeof(self)weakSelf = self;
+    void (^original)(NSUInteger bytesRead, long long totalBytesRead, long long totalBytesExpectedToRead) = [operation.downloadProgress copy];
+    [operation setDownloadProgressBlock:^(NSUInteger bytesRead, long long totalBytesRead, long long totalBytesExpectedToRead) {
+        if (original) {
+            original(bytesRead, totalBytesRead, totalBytesExpectedToRead);
+        }
+
+        dispatch_async(dispatch_get_main_queue(), ^{
+            if (totalBytesExpectedToRead > 0) {
+                __strong __typeof(weakSelf)strongSelf = weakSelf;
+                [strongSelf setProgress:(totalBytesRead / (totalBytesExpectedToRead  * 1.0f)) animated:animated];
+            }
+        });
+    }];
+}
+
+#pragma mark - NSKeyValueObserving
+
+- (void)observeValueForKeyPath:(NSString *)keyPath
+                      ofObject:(id)object
+                        change:(__unused NSDictionary *)change
+                       context:(void *)context
+{
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000
+    if (context == AFTaskCountOfBytesSentContext || context == AFTaskCountOfBytesReceivedContext) {
+        if ([keyPath isEqualToString:NSStringFromSelector(@selector(countOfBytesSent))]) {
+            if ([object countOfBytesExpectedToSend] > 0) {
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    [self setProgress:[object countOfBytesSent] / ([object countOfBytesExpectedToSend] * 1.0f) animated:self.af_uploadProgressAnimated];
+                });
+            }
+        }
+
+        if ([keyPath isEqualToString:NSStringFromSelector(@selector(countOfBytesReceived))]) {
+            if ([object countOfBytesExpectedToReceive] > 0) {
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    [self setProgress:[object countOfBytesReceived] / ([object countOfBytesExpectedToReceive] * 1.0f) animated:self.af_downloadProgressAnimated];
+                });
+            }
+        }
+
+        if ([keyPath isEqualToString:NSStringFromSelector(@selector(state))]) {
+            if ([(NSURLSessionTask *)object state] == NSURLSessionTaskStateCompleted) {
+                @try {
+                    [object removeObserver:self forKeyPath:NSStringFromSelector(@selector(state))];
+
+                    if (context == AFTaskCountOfBytesSentContext) {
+                        [object removeObserver:self forKeyPath:NSStringFromSelector(@selector(countOfBytesSent))];
+                    }
+
+                    if (context == AFTaskCountOfBytesReceivedContext) {
+                        [object removeObserver:self forKeyPath:NSStringFromSelector(@selector(countOfBytesReceived))];
+                    }
+                }
+                @catch (NSException * __unused exception) {}
+            }
+        }
+    }
+#endif
+}
+
+@end
+
+#endif
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIRefreshControl+AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIRefreshControl+AFNetworking.h
new file mode 100644
index 000000000..37ce772de
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIRefreshControl+AFNetworking.h
@@ -0,0 +1,64 @@
+// UIRefreshControl+AFNetworking.m
+//
+// Copyright (c) 2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import <Foundation/Foundation.h>
+
+#import <Availability.h>
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+
+#import <UIKit/UIKit.h>
+
+@class AFURLConnectionOperation;
+
+/**
+ This category adds methods to the UIKit framework's `UIRefreshControl` class. The methods in this category provide support for automatically begining and ending refreshing depending on the loading state of a request operation or session task.
+ */
+@interface UIRefreshControl (AFNetworking)
+
+///-----------------------------------
+/// @name Refreshing for Session Tasks
+///-----------------------------------
+
+/**
+ Binds the refreshing state to the state of the specified task.
+ 
+ @param task The task. If `nil`, automatic updating from any previously specified operation will be diabled.
+ */
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000
+- (void)setRefreshingWithStateOfTask:(NSURLSessionTask *)task;
+#endif
+
+///----------------------------------------
+/// @name Refreshing for Request Operations
+///----------------------------------------
+
+/**
+ Binds the refreshing state to the execution state of the specified operation.
+
+ @param operation The operation. If `nil`, automatic updating from any previously specified operation will be disabled.
+ */
+- (void)setRefreshingWithStateOfOperation:(AFURLConnectionOperation *)operation;
+
+@end
+
+#endif
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIRefreshControl+AFNetworking.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIRefreshControl+AFNetworking.m
new file mode 100644
index 000000000..e266451fe
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIRefreshControl+AFNetworking.m
@@ -0,0 +1,93 @@
+// UIRefreshControl+AFNetworking.m
+//
+// Copyright (c) 2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import "UIRefreshControl+AFNetworking.h"
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+
+#import "AFHTTPRequestOperation.h"
+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000
+#import "AFURLSessionManager.h"
+#endif
+
+@implementation UIRefreshControl (AFNetworking)
+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000
+- (void)setRefreshingWithStateOfTask:(NSURLSessionTask *)task {
+    NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
+
+    [notificationCenter removeObserver:self name:AFNetworkingTaskDidResumeNotification object:nil];
+    [notificationCenter removeObserver:self name:AFNetworkingTaskDidSuspendNotification object:nil];
+    [notificationCenter removeObserver:self name:AFNetworkingTaskDidCompleteNotification object:nil];
+
+    if (task) {
+        if (task.state == NSURLSessionTaskStateRunning) {
+            [self beginRefreshing];
+
+            [notificationCenter addObserver:self selector:@selector(af_beginRefreshing) name:AFNetworkingTaskDidResumeNotification object:task];
+            [notificationCenter addObserver:self selector:@selector(af_endRefreshing) name:AFNetworkingTaskDidCompleteNotification object:task];
+            [notificationCenter addObserver:self selector:@selector(af_endRefreshing) name:AFNetworkingTaskDidSuspendNotification object:task];
+        } else {
+            [self endRefreshing];
+        }
+    }
+}
+#endif
+
+- (void)setRefreshingWithStateOfOperation:(AFURLConnectionOperation *)operation {
+    NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
+
+    [notificationCenter removeObserver:self name:AFNetworkingOperationDidStartNotification object:nil];
+    [notificationCenter removeObserver:self name:AFNetworkingOperationDidFinishNotification object:nil];
+
+    if (operation) {
+        if (![operation isFinished]) {
+            if ([operation isExecuting]) {
+                [self beginRefreshing];
+            } else {
+                [self endRefreshing];
+            }
+
+            [notificationCenter addObserver:self selector:@selector(af_beginRefreshing) name:AFNetworkingOperationDidStartNotification object:operation];
+            [notificationCenter addObserver:self selector:@selector(af_endRefreshing) name:AFNetworkingOperationDidFinishNotification object:operation];
+        }
+    }
+}
+
+#pragma mark -
+
+- (void)af_beginRefreshing {
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [self beginRefreshing];
+    });
+}
+
+- (void)af_endRefreshing {
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [self endRefreshing];
+    });
+}
+
+@end
+
+#endif
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.h
new file mode 100644
index 000000000..202e8f4ea
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.h
@@ -0,0 +1,83 @@
+// UIWebView+AFNetworking.h
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import <Foundation/Foundation.h>
+
+#import <Availability.h>
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+
+#import <UIKit/UIKit.h>
+
+@class AFHTTPRequestSerializer, AFHTTPResponseSerializer;
+@protocol AFURLRequestSerialization, AFURLResponseSerialization;
+
+/**
+ This category adds methods to the UIKit framework's `UIWebView` class. The methods in this category provide increased control over the request cycle, including progress monitoring and success / failure handling.
+ 
+ @discussion When using these category methods, make sure to assign `delegate` for the web view, which implements `–webView:shouldStartLoadWithRequest:navigationType:` appropriately. This allows for tapped links to be loaded through AFNetworking, and can ensure that `canGoBack` & `canGoForward` update their values correctly.
+ */
+@interface UIWebView (AFNetworking)
+
+/**
+ The request serializer used to serialize requests made with the `-loadRequest:...` category methods. By default, this is an instance of `AFHTTPRequestSerializer`.
+ */
+@property (nonatomic, strong) AFHTTPRequestSerializer <AFURLRequestSerialization> * requestSerializer;
+
+/**
+ The response serializer used to serialize responses made with the `-loadRequest:...` category methods. By default, this is an instance of `AFHTTPResponseSerializer`.
+ */
+@property (nonatomic, strong) AFHTTPResponseSerializer <AFURLResponseSerialization> * responseSerializer;
+
+/**
+ Asynchronously loads the specified request.
+ 
+ @param request A URL request identifying the location of the content to load. This must not be `nil`.
+ @param progress A block object to be called when an undetermined number of bytes have been downloaded from the server. This block has no return value and takes three arguments: the number of bytes read since the last time the download progress block was called, the total bytes read, and the total bytes expected to be read during the request, as initially determined by the expected content size of the `NSHTTPURLResponse` object. This block may be called multiple times, and will execute on the main thread.
+ @param success A block object to be executed when the request finishes loading successfully. This block returns the HTML string to be loaded by the web view, and takes two arguments: the response, and the response string.
+ @param failure A block object to be executed when the request operation finishes unsuccessfully, or that finishes successfully, but encountered an error while parsing the response data. This block has no return value and takes a single argument: the error that occurred.
+ */
+- (void)loadRequest:(NSURLRequest *)request
+           progress:(void (^)(NSUInteger bytesWritten, long long totalBytesWritten, long long totalBytesExpectedToWrite))progress
+            success:(NSString * (^)(NSHTTPURLResponse *response, NSString *HTML))success
+            failure:(void (^)(NSError *error))failure;
+
+/**
+ Asynchronously loads the data associated with a particular request with a specified MIME type and text encoding.
+
+ @param request A URL request identifying the location of the content to load. This must not be `nil`.
+ @param MIMEType The MIME type of the content. Defaults to the content type of the response if not specified.
+ @param textEncodingName The IANA encoding name, as in `utf-8` or `utf-16`. Defaults to the response text encoding if not specified.
+ @param progress A block object to be called when an undetermined number of bytes have been downloaded from the server. This block has no return value and takes three arguments: the number of bytes read since the last time the download progress block was called, the total bytes read, and the total bytes expected to be read during the request, as initially determined by the expected content size of the `NSHTTPURLResponse` object. This block may be called multiple times, and will execute on the main thread.
+ @param success A block object to be executed when the request finishes loading successfully. This block returns the data to be loaded by the web view and takes two arguments: the response, and the downloaded data.
+ @param failure A block object to be executed when the request operation finishes unsuccessfully, or that finishes successfully, but encountered an error while parsing the response data. This block has no return value and takes a single argument: the error that occurred.
+ */
+- (void)loadRequest:(NSURLRequest *)request
+           MIMEType:(NSString *)MIMEType
+   textEncodingName:(NSString *)textEncodingName
+           progress:(void (^)(NSUInteger bytesWritten, long long totalBytesWritten, long long totalBytesExpectedToWrite))progress
+            success:(NSData * (^)(NSHTTPURLResponse *response, NSData *data))success
+            failure:(void (^)(NSError *error))failure;
+
+@end
+
+#endif
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.m
new file mode 100644
index 000000000..525d02aea
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.m
@@ -0,0 +1,151 @@
+// UIWebView+AFNetworking.m
+//
+// Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import "UIWebView+AFNetworking.h"
+
+#import <objc/runtime.h>
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+
+#import "AFHTTPRequestOperation.h"
+#import "AFURLResponseSerialization.h"
+#import "AFURLRequestSerialization.h"
+
+@interface UIWebView (_AFNetworking)
+@property (readwrite, nonatomic, strong, setter = af_setHTTPRequestOperation:) AFHTTPRequestOperation *af_HTTPRequestOperation;
+@end
+
+@implementation UIWebView (_AFNetworking)
+
+- (AFHTTPRequestOperation *)af_HTTPRequestOperation {
+    return (AFHTTPRequestOperation *)objc_getAssociatedObject(self, @selector(af_HTTPRequestOperation));
+}
+
+- (void)af_setHTTPRequestOperation:(AFHTTPRequestOperation *)operation {
+    objc_setAssociatedObject(self, @selector(af_HTTPRequestOperation), operation, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+@end
+
+#pragma mark -
+
+@implementation UIWebView (AFNetworking)
+
+- (AFHTTPRequestSerializer <AFURLRequestSerialization> *)requestSerializer {
+    static AFHTTPRequestSerializer <AFURLRequestSerialization> *_af_defaultRequestSerializer = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        _af_defaultRequestSerializer = [AFHTTPRequestSerializer serializer];
+    });
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu"
+    return objc_getAssociatedObject(self, @selector(requestSerializer)) ?: _af_defaultRequestSerializer;
+#pragma clang diagnostic pop
+}
+
+- (void)setRequestSerializer:(AFHTTPRequestSerializer<AFURLRequestSerialization> *)requestSerializer {
+    objc_setAssociatedObject(self, @selector(requestSerializer), requestSerializer, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+- (AFHTTPResponseSerializer <AFURLResponseSerialization> *)responseSerializer {
+    static AFHTTPResponseSerializer <AFURLResponseSerialization> *_af_defaultResponseSerializer = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        _af_defaultResponseSerializer = [AFHTTPResponseSerializer serializer];
+    });
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu"
+    return objc_getAssociatedObject(self, @selector(responseSerializer)) ?: _af_defaultResponseSerializer;
+#pragma clang diagnostic pop
+}
+
+- (void)setResponseSerializer:(AFHTTPResponseSerializer<AFURLResponseSerialization> *)responseSerializer {
+    objc_setAssociatedObject(self, @selector(responseSerializer), responseSerializer, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+#pragma mark -
+
+- (void)loadRequest:(NSURLRequest *)request
+           progress:(void (^)(NSUInteger bytesWritten, long long totalBytesWritten, long long totalBytesExpectedToWrite))progress
+            success:(NSString * (^)(NSHTTPURLResponse *response, NSString *HTML))success
+            failure:(void (^)(NSError *error))failure
+{
+    [self loadRequest:request MIMEType:nil textEncodingName:nil progress:progress success:^NSData *(NSHTTPURLResponse *response, NSData *data) {
+        NSStringEncoding stringEncoding = NSUTF8StringEncoding;
+        if (response.textEncodingName) {
+            CFStringEncoding encoding = CFStringConvertIANACharSetNameToEncoding((CFStringRef)response.textEncodingName);
+            if (encoding != kCFStringEncodingInvalidId) {
+                stringEncoding = CFStringConvertEncodingToNSStringEncoding(encoding);
+            }
+        }
+
+        NSString *string = [[NSString alloc] initWithData:data encoding:stringEncoding];
+        if (success) {
+            string = success(response, string);
+        }
+
+        return [string dataUsingEncoding:stringEncoding];
+    } failure:failure];
+}
+
+- (void)loadRequest:(NSURLRequest *)request
+           MIMEType:(NSString *)MIMEType
+   textEncodingName:(NSString *)textEncodingName
+           progress:(void (^)(NSUInteger bytesWritten, long long totalBytesWritten, long long totalBytesExpectedToWrite))progress
+            success:(NSData * (^)(NSHTTPURLResponse *response, NSData *data))success
+            failure:(void (^)(NSError *error))failure
+{
+    NSParameterAssert(request);
+
+    if (self.af_HTTPRequestOperation) {
+        [self.af_HTTPRequestOperation cancel];
+    }
+
+    request = [self.requestSerializer requestBySerializingRequest:request withParameters:nil error:nil];
+
+    self.af_HTTPRequestOperation = [[AFHTTPRequestOperation alloc] initWithRequest:request];
+    self.af_HTTPRequestOperation.responseSerializer = self.responseSerializer;
+
+    __weak __typeof(self)weakSelf = self;
+    [self.af_HTTPRequestOperation setDownloadProgressBlock:progress];
+    [self.af_HTTPRequestOperation setCompletionBlockWithSuccess:^(AFHTTPRequestOperation *operation, id __unused responseObject) {
+        NSData *data = success ? success(operation.response, operation.responseData) : operation.responseData;
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu"
+        __strong __typeof(weakSelf) strongSelf = weakSelf;
+        [strongSelf loadData:data MIMEType:(MIMEType ?: [operation.response MIMEType]) textEncodingName:(textEncodingName ?: [operation.response textEncodingName]) baseURL:[operation.response URL]];
+#pragma clang diagnostic pop
+    } failure:^(AFHTTPRequestOperation * __unused operation, NSError *error) {
+        if (failure) {
+            failure(error);
+        }
+    }];
+
+    [self.af_HTTPRequestOperation start];
+}
+
+@end
+
+#endif
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFHTTPRequestOperation.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFHTTPRequestOperation.h
new file mode 120000
index 000000000..ac762c823
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFHTTPRequestOperation.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFHTTPRequestOperation.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFHTTPRequestOperationManager.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFHTTPRequestOperationManager.h
new file mode 120000
index 000000000..9dcc623c6
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFHTTPRequestOperationManager.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFHTTPRequestOperationManager.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFHTTPSessionManager.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFHTTPSessionManager.h
new file mode 120000
index 000000000..56feb9fb8
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFHTTPSessionManager.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFHTTPSessionManager.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFNetworkActivityIndicatorManager.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFNetworkActivityIndicatorManager.h
new file mode 120000
index 000000000..67519d984
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFNetworkActivityIndicatorManager.h
@@ -0,0 +1 @@
+../../../AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFNetworkReachabilityManager.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFNetworkReachabilityManager.h
new file mode 120000
index 000000000..68fc7744f
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFNetworkReachabilityManager.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFNetworkReachabilityManager.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFNetworking.h
new file mode 120000
index 000000000..a5a38da7d
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFNetworking.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFNetworking.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFSecurityPolicy.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFSecurityPolicy.h
new file mode 120000
index 000000000..fd1322db9
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFSecurityPolicy.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFSecurityPolicy.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLConnectionOperation.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLConnectionOperation.h
new file mode 120000
index 000000000..d9b35fb75
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLConnectionOperation.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFURLConnectionOperation.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLRequestSerialization.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLRequestSerialization.h
new file mode 120000
index 000000000..ca8209b81
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLRequestSerialization.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFURLRequestSerialization.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLResponseSerialization.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLResponseSerialization.h
new file mode 120000
index 000000000..e36a765d8
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLResponseSerialization.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFURLResponseSerialization.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLSessionManager.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLSessionManager.h
new file mode 120000
index 000000000..835101de7
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLSessionManager.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFURLSessionManager.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIActivityIndicatorView+AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIActivityIndicatorView+AFNetworking.h
new file mode 120000
index 000000000..c534ebfb0
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIActivityIndicatorView+AFNetworking.h
@@ -0,0 +1 @@
+../../../AFNetworking/UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIAlertView+AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIAlertView+AFNetworking.h
new file mode 120000
index 000000000..f99281338
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIAlertView+AFNetworking.h
@@ -0,0 +1 @@
+../../../AFNetworking/UIKit+AFNetworking/UIAlertView+AFNetworking.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIButton+AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIButton+AFNetworking.h
new file mode 120000
index 000000000..8f2e22193
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIButton+AFNetworking.h
@@ -0,0 +1 @@
+../../../AFNetworking/UIKit+AFNetworking/UIButton+AFNetworking.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIImageView+AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIImageView+AFNetworking.h
new file mode 120000
index 000000000..a95d67380
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIImageView+AFNetworking.h
@@ -0,0 +1 @@
+../../../AFNetworking/UIKit+AFNetworking/UIImageView+AFNetworking.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIKit+AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIKit+AFNetworking.h
new file mode 120000
index 000000000..95017cce5
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIKit+AFNetworking.h
@@ -0,0 +1 @@
+../../../AFNetworking/UIKit+AFNetworking/UIKit+AFNetworking.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIProgressView+AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIProgressView+AFNetworking.h
new file mode 120000
index 000000000..730b167dc
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIProgressView+AFNetworking.h
@@ -0,0 +1 @@
+../../../AFNetworking/UIKit+AFNetworking/UIProgressView+AFNetworking.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIRefreshControl+AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIRefreshControl+AFNetworking.h
new file mode 120000
index 000000000..8efd82620
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIRefreshControl+AFNetworking.h
@@ -0,0 +1 @@
+../../../AFNetworking/UIKit+AFNetworking/UIRefreshControl+AFNetworking.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIWebView+AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIWebView+AFNetworking.h
new file mode 120000
index 000000000..c8df6ef17
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIWebView+AFNetworking.h
@@ -0,0 +1 @@
+../../../AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFHTTPRequestOperation.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFHTTPRequestOperation.h
new file mode 120000
index 000000000..ac762c823
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFHTTPRequestOperation.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFHTTPRequestOperation.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFHTTPRequestOperationManager.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFHTTPRequestOperationManager.h
new file mode 120000
index 000000000..9dcc623c6
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFHTTPRequestOperationManager.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFHTTPRequestOperationManager.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFHTTPSessionManager.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFHTTPSessionManager.h
new file mode 120000
index 000000000..56feb9fb8
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFHTTPSessionManager.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFHTTPSessionManager.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFNetworkActivityIndicatorManager.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFNetworkActivityIndicatorManager.h
new file mode 120000
index 000000000..67519d984
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFNetworkActivityIndicatorManager.h
@@ -0,0 +1 @@
+../../../AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFNetworkReachabilityManager.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFNetworkReachabilityManager.h
new file mode 120000
index 000000000..68fc7744f
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFNetworkReachabilityManager.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFNetworkReachabilityManager.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFNetworking.h
new file mode 120000
index 000000000..a5a38da7d
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFNetworking.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFNetworking.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFSecurityPolicy.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFSecurityPolicy.h
new file mode 120000
index 000000000..fd1322db9
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFSecurityPolicy.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFSecurityPolicy.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLConnectionOperation.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLConnectionOperation.h
new file mode 120000
index 000000000..d9b35fb75
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLConnectionOperation.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFURLConnectionOperation.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLRequestSerialization.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLRequestSerialization.h
new file mode 120000
index 000000000..ca8209b81
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLRequestSerialization.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFURLRequestSerialization.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLResponseSerialization.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLResponseSerialization.h
new file mode 120000
index 000000000..e36a765d8
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLResponseSerialization.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFURLResponseSerialization.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLSessionManager.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLSessionManager.h
new file mode 120000
index 000000000..835101de7
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLSessionManager.h
@@ -0,0 +1 @@
+../../../AFNetworking/AFNetworking/AFURLSessionManager.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIActivityIndicatorView+AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIActivityIndicatorView+AFNetworking.h
new file mode 120000
index 000000000..c534ebfb0
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIActivityIndicatorView+AFNetworking.h
@@ -0,0 +1 @@
+../../../AFNetworking/UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIAlertView+AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIAlertView+AFNetworking.h
new file mode 120000
index 000000000..f99281338
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIAlertView+AFNetworking.h
@@ -0,0 +1 @@
+../../../AFNetworking/UIKit+AFNetworking/UIAlertView+AFNetworking.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIButton+AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIButton+AFNetworking.h
new file mode 120000
index 000000000..8f2e22193
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIButton+AFNetworking.h
@@ -0,0 +1 @@
+../../../AFNetworking/UIKit+AFNetworking/UIButton+AFNetworking.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIImageView+AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIImageView+AFNetworking.h
new file mode 120000
index 000000000..a95d67380
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIImageView+AFNetworking.h
@@ -0,0 +1 @@
+../../../AFNetworking/UIKit+AFNetworking/UIImageView+AFNetworking.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIKit+AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIKit+AFNetworking.h
new file mode 120000
index 000000000..95017cce5
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIKit+AFNetworking.h
@@ -0,0 +1 @@
+../../../AFNetworking/UIKit+AFNetworking/UIKit+AFNetworking.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIProgressView+AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIProgressView+AFNetworking.h
new file mode 120000
index 000000000..730b167dc
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIProgressView+AFNetworking.h
@@ -0,0 +1 @@
+../../../AFNetworking/UIKit+AFNetworking/UIProgressView+AFNetworking.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIRefreshControl+AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIRefreshControl+AFNetworking.h
new file mode 120000
index 000000000..8efd82620
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIRefreshControl+AFNetworking.h
@@ -0,0 +1 @@
+../../../AFNetworking/UIKit+AFNetworking/UIRefreshControl+AFNetworking.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIWebView+AFNetworking.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIWebView+AFNetworking.h
new file mode 120000
index 000000000..c8df6ef17
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIWebView+AFNetworking.h
@@ -0,0 +1 @@
+../../../AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.h
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Manifest.lock b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Manifest.lock
new file mode 100644
index 000000000..c3fbbd33b
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Manifest.lock
@@ -0,0 +1,30 @@
+PODS:
+  - AFNetworking (2.5.0):
+    - AFNetworking/NSURLConnection (= 2.5.0)
+    - AFNetworking/NSURLSession (= 2.5.0)
+    - AFNetworking/Reachability (= 2.5.0)
+    - AFNetworking/Security (= 2.5.0)
+    - AFNetworking/Serialization (= 2.5.0)
+    - AFNetworking/UIKit (= 2.5.0)
+  - AFNetworking/NSURLConnection (2.5.0):
+    - AFNetworking/Reachability
+    - AFNetworking/Security
+    - AFNetworking/Serialization
+  - AFNetworking/NSURLSession (2.5.0):
+    - AFNetworking/Reachability
+    - AFNetworking/Security
+    - AFNetworking/Serialization
+  - AFNetworking/Reachability (2.5.0)
+  - AFNetworking/Security (2.5.0)
+  - AFNetworking/Serialization (2.5.0)
+  - AFNetworking/UIKit (2.5.0):
+    - AFNetworking/NSURLConnection
+    - AFNetworking/NSURLSession
+
+DEPENDENCIES:
+  - AFNetworking (= 2.5.0)
+
+SPEC CHECKSUMS:
+  AFNetworking: 96ac9bf3eda33582701cb1fcc5b896aa1e20311e
+
+COCOAPODS: 0.37.0
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Pods.xcodeproj/project.pbxproj b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Pods.xcodeproj/project.pbxproj
new file mode 100644
index 000000000..27db8eaff
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Pods.xcodeproj/project.pbxproj
@@ -0,0 +1,906 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		05F10BA864A937B79CEF7AB7 /* AFURLRequestSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 5447FF01A06FD20A36A2E25D /* AFURLRequestSerialization.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode"; }; };
+		07109DEE2D3CCAC6E27FF610 /* AFNetworkReachabilityManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 49BC80768F1ECB71168E4F0E /* AFNetworkReachabilityManager.h */; };
+		07C1C70C97F4B12085CF9B54 /* UIImageView+AFNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = CEA9DC40500CC7C2D1322784 /* UIImageView+AFNetworking.h */; };
+		09696F6B38AF4AA07130BDA5 /* AFNetworkReachabilityManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 49BC80768F1ECB71168E4F0E /* AFNetworkReachabilityManager.h */; };
+		0B0AC3DCF875ACE1AB25DB06 /* AFSecurityPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 497A151ED83BFF5C3E5B595D /* AFSecurityPolicy.h */; };
+		0D8DD2899735197CB2EDFC53 /* Pods-OHHTTPStubs iOS Tests-AFNetworking-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = BF517ABC8323C43878EE5182 /* Pods-OHHTTPStubs iOS Tests-AFNetworking-dummy.m */; };
+		0ED74CA078B559E46733EB86 /* AFHTTPRequestOperationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = F35D08450536F79059CA3B8F /* AFHTTPRequestOperationManager.h */; };
+		111FA2DCCECDC450CCE86B79 /* UIProgressView+AFNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = 7D0F6E023E9623249382E1A8 /* UIProgressView+AFNetworking.h */; };
+		12614473A129EE388A04B562 /* AFNetworkReachabilityManager.m in Sources */ = {isa = PBXBuildFile; fileRef = F35939851ED38CB5738C6911 /* AFNetworkReachabilityManager.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode"; }; };
+		1A69E8016FF6786724EA2DA5 /* AFURLRequestSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 5447FF01A06FD20A36A2E25D /* AFURLRequestSerialization.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode"; }; };
+		1B0340808D17594E7E20416E /* AFURLResponseSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E571E4A2307F50521384E71 /* AFURLResponseSerialization.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode"; }; };
+		20CD2FEFF175371C94C52D11 /* AFHTTPSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 093C199AD28717A653273DE0 /* AFHTTPSessionManager.h */; };
+		25142432152E0D0FC54821E0 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 88C39391AEC2A6F4CE298276 /* Foundation.framework */; };
+		2A341F22AECC9350634749A9 /* UIProgressView+AFNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = D0B40D3B78D919B1D19604BC /* UIProgressView+AFNetworking.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode"; }; };
+		2B8F7B192A59BAAF912AE712 /* UIActivityIndicatorView+AFNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = 551B551AA3280D6BA8335A95 /* UIActivityIndicatorView+AFNetworking.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode"; }; };
+		37C0EFD701AE7760758BD7DC /* AFHTTPRequestOperationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = F35D08450536F79059CA3B8F /* AFHTTPRequestOperationManager.h */; };
+		3BB9707D34A1B32642EB71FF /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51BD7E303C7824651C140D50 /* Security.framework */; };
+		3F7B393D7F0475C76239AEF5 /* AFSecurityPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 497A151ED83BFF5C3E5B595D /* AFSecurityPolicy.h */; };
+		44648DED9CBCDDE10E27F589 /* AFURLConnectionOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C156A7437E431745406C066 /* AFURLConnectionOperation.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode"; }; };
+		4702916A49A441A9A944E912 /* AFURLConnectionOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 57ADF24AEC45DB9B5B2B88EA /* AFURLConnectionOperation.h */; };
+		4870AB9943E61FC2D614B70D /* AFURLResponseSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = 6015221E4A360237C44A8015 /* AFURLResponseSerialization.h */; };
+		4900C036A4BF4E5C2EA93B03 /* AFNetworkReachabilityManager.m in Sources */ = {isa = PBXBuildFile; fileRef = F35939851ED38CB5738C6911 /* AFNetworkReachabilityManager.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode"; }; };
+		4F01C6D7B6853EF4AA5B65C0 /* UIActivityIndicatorView+AFNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DC2B2A5E77746321B51034D /* UIActivityIndicatorView+AFNetworking.h */; };
+		50C3B855E98EA0044351A87B /* UIButton+AFNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = C024B152BB38AA08EF79BCA1 /* UIButton+AFNetworking.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode"; }; };
+		522A96083A107EBDABC5A8E3 /* AFHTTPRequestOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 505424A140C5A8E367324EB7 /* AFHTTPRequestOperation.h */; };
+		543C00C69B2B794A949F073F /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FD3A78B755B763DA38819067 /* Security.framework */; };
+		578705629C31E0FC3C99ACB5 /* AFURLRequestSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = 3CEE8864C15957F177F3E032 /* AFURLRequestSerialization.h */; };
+		58C2691912FAE6112F221A24 /* AFNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = A6E08739E866C3624A421F65 /* AFNetworking.h */; };
+		5D38932376ACB1D542540DE8 /* AFNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = A6E08739E866C3624A421F65 /* AFNetworking.h */; };
+		5FFE1317E23BD6A2F1739550 /* UIImageView+AFNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3004FE78D278EBD2159B2D /* UIImageView+AFNetworking.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode"; }; };
+		63359255DE4DAB8D48D8398A /* AFHTTPRequestOperationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A54E4650469C5E299F0D89E /* AFHTTPRequestOperationManager.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode"; }; };
+		6F1F3338B6C18B4B6A5FF672 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D2AC08FFF124E07A01EAFC2 /* CoreServices.framework */; };
+		754E33A6C10F46A7A36092D8 /* AFHTTPRequestOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 505424A140C5A8E367324EB7 /* AFHTTPRequestOperation.h */; };
+		77D3C6F11D2CA0A86A3EAF29 /* Pods-OHHTTPStubs Mac Tests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 321953436B9349FCF7BF8964 /* Pods-OHHTTPStubs Mac Tests-dummy.m */; };
+		81ADB8C804615D4048C91FDD /* Pods-OHHTTPStubs iOS Tests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = D83EBBF184D064CDAD710A40 /* Pods-OHHTTPStubs iOS Tests-dummy.m */; };
+		85B667118C68BEDF6F983AFC /* UIAlertView+AFNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = ED516141A9266AEAAD48B422 /* UIAlertView+AFNetworking.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode"; }; };
+		8763C4B08BB723B01752ED7A /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D4DADF799A34500A06BD78A /* SystemConfiguration.framework */; };
+		88512D9EC7516213FBEEDFE1 /* AFHTTPRequestOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = D78D241677420BC40EAB1666 /* AFHTTPRequestOperation.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode"; }; };
+		8F6FABABA39F6EB2B25939F3 /* AFHTTPRequestOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = D78D241677420BC40EAB1666 /* AFHTTPRequestOperation.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode"; }; };
+		92DADB41EC0F2CE69047AB84 /* UIRefreshControl+AFNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = 560D9D22979DFBE868DEDD88 /* UIRefreshControl+AFNetworking.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode"; }; };
+		932CE4581D3CC4B038CCDC7B /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FA4BA2FEF754E9D702A1150 /* Cocoa.framework */; };
+		94ABFD6DD946F56D219ADC22 /* UIWebView+AFNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = 3915011C479A0B120388E604 /* UIWebView+AFNetworking.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode"; }; };
+		96F3BAB009B5A271F0A4CAD7 /* AFSecurityPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = 7ACAD995D17054176A5526B8 /* AFSecurityPolicy.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode"; }; };
+		9A5155FDA741A40E62176688 /* AFNetworkActivityIndicatorManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 55B5C6EAB2939CF9557557FB /* AFNetworkActivityIndicatorManager.h */; };
+		9B3D20C65197332A7B9D7A10 /* AFHTTPSessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E3CB595356B57E21F6B502D2 /* AFHTTPSessionManager.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode"; }; };
+		9EF6386D389001640865A6A0 /* UIAlertView+AFNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = F23E7994981C3DACAAF7E45C /* UIAlertView+AFNetworking.h */; };
+		A89EEDF58A1E524677F157AA /* AFURLResponseSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = 6015221E4A360237C44A8015 /* AFURLResponseSerialization.h */; };
+		AB53CB4E94CC50F54326D9EC /* UIButton+AFNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = F8B3CC903D3CB9DDE04B17D4 /* UIButton+AFNetworking.h */; };
+		B15E5A587912F49A725192DA /* AFSecurityPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = 7ACAD995D17054176A5526B8 /* AFSecurityPolicy.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode"; }; };
+		B24CEF9198BE0DFD988FFCC8 /* AFHTTPSessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E3CB595356B57E21F6B502D2 /* AFHTTPSessionManager.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode"; }; };
+		B917CE9E60F38DA6AE956D10 /* AFURLSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 227A9F36B3754E843BA612D4 /* AFURLSessionManager.h */; };
+		BEE8719A65D2BF151C8FF1B1 /* AFURLConnectionOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C156A7437E431745406C066 /* AFURLConnectionOperation.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode"; }; };
+		BF4EA978E0DB56CAF0A3D751 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 910E02E98AB0087421897E08 /* MobileCoreServices.framework */; };
+		C494DB10D68900498C06D033 /* Pods-OHHTTPStubs Mac Tests-AFNetworking-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = F4090349D8B910197D7DF11F /* Pods-OHHTTPStubs Mac Tests-AFNetworking-dummy.m */; };
+		CCBEB7124FE5B8E0772ACFBD /* UIRefreshControl+AFNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FD3A50893C3DD6D814913A1 /* UIRefreshControl+AFNetworking.h */; };
+		D1803A9D2201964C36D553F2 /* AFURLSessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B303111D0141201348C4833 /* AFURLSessionManager.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode"; }; };
+		D348E2D2580AA24B5E35DAC0 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7581CD963368C82A3138112D /* SystemConfiguration.framework */; };
+		D999D52BA23C8B7FC607D108 /* UIKit+AFNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E983A5C6230930CDB296DFA /* UIKit+AFNetworking.h */; };
+		E2ED8AB618422BC864886DCB /* AFHTTPSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 093C199AD28717A653273DE0 /* AFHTTPSessionManager.h */; };
+		E36FCA4D3E27E2FFA7E5A27B /* AFNetworkActivityIndicatorManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 762E066FFCD8D46681603BBB /* AFNetworkActivityIndicatorManager.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode"; }; };
+		E4DD261A8784962967035ABE /* AFURLSessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B303111D0141201348C4833 /* AFURLSessionManager.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode"; }; };
+		E660CA7196C3AE15DA966314 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 739C1918DF54A0F91712A4A6 /* CoreGraphics.framework */; };
+		EC557A30CAD5634B82D54AED /* AFURLSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 227A9F36B3754E843BA612D4 /* AFURLSessionManager.h */; };
+		F04762E2C44454C499EA9042 /* AFURLResponseSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E571E4A2307F50521384E71 /* AFURLResponseSerialization.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode"; }; };
+		F21FECFE160DC8796FCF20ED /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FA4BA2FEF754E9D702A1150 /* Cocoa.framework */; };
+		F4F2BA5E80803A456F424CA8 /* AFHTTPRequestOperationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A54E4650469C5E299F0D89E /* AFHTTPRequestOperationManager.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode"; }; };
+		F558FDD298AA8E37CD4AD341 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 88C39391AEC2A6F4CE298276 /* Foundation.framework */; };
+		F6043955003537905B134B62 /* AFURLRequestSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = 3CEE8864C15957F177F3E032 /* AFURLRequestSerialization.h */; };
+		FA6A84FB2D6AF1D3183C1373 /* AFURLConnectionOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 57ADF24AEC45DB9B5B2B88EA /* AFURLConnectionOperation.h */; };
+		FEFED9420F6A72FB3F123BF5 /* UIWebView+AFNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = 9ABBA795C17AC61F960788BE /* UIWebView+AFNetworking.h */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		C627703060BD61C91F2A4C64 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = E0DDD61A0770FF4B6366DB86 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 11C6440715C5C37466193A71;
+			remoteInfo = "Pods-OHHTTPStubs Mac Tests-AFNetworking";
+		};
+		F877A0D43CD157C66D5C6BB5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = E0DDD61A0770FF4B6366DB86 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = FFE6CE2F3BF00868F830AF0D;
+			remoteInfo = "Pods-OHHTTPStubs iOS Tests-AFNetworking";
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXFileReference section */
+		00B451C5114FF92A77CC1279 /* libPods-OHHTTPStubs Mac Tests-AFNetworking.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OHHTTPStubs Mac Tests-AFNetworking.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		093C199AD28717A653273DE0 /* AFHTTPSessionManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFHTTPSessionManager.h; path = AFNetworking/AFHTTPSessionManager.h; sourceTree = "<group>"; };
+		0B163EB111AF4BAF3759BBA1 /* Pods-OHHTTPStubs iOS Tests-environment.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-OHHTTPStubs iOS Tests-environment.h"; sourceTree = "<group>"; };
+		14337C81A6290F7C528EA00B /* Pods-OHHTTPStubs iOS Tests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-OHHTTPStubs iOS Tests-acknowledgements.plist"; sourceTree = "<group>"; };
+		19D183DE47274EDE451A5BC5 /* Pods-OHHTTPStubs iOS Tests-AFNetworking-Private.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OHHTTPStubs iOS Tests-AFNetworking-Private.xcconfig"; path = "../Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking-Private.xcconfig"; sourceTree = "<group>"; };
+		1D4DADF799A34500A06BD78A /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; };
+		1EDD5C86339F3D8A90DEEAD3 /* Pods-OHHTTPStubs iOS Tests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-OHHTTPStubs iOS Tests-acknowledgements.markdown"; sourceTree = "<group>"; };
+		21559B0A80457F825BA4C039 /* Podfile */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
+		227A9F36B3754E843BA612D4 /* AFURLSessionManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFURLSessionManager.h; path = AFNetworking/AFURLSessionManager.h; sourceTree = "<group>"; };
+		274F152996A2D6D92762AAFC /* Pods-OHHTTPStubs Mac Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-OHHTTPStubs Mac Tests.debug.xcconfig"; sourceTree = "<group>"; };
+		29D3CFBC625C8949354A4766 /* Pods-OHHTTPStubs Mac Tests-AFNetworking.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-OHHTTPStubs Mac Tests-AFNetworking.xcconfig"; sourceTree = "<group>"; };
+		2E983A5C6230930CDB296DFA /* UIKit+AFNetworking.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIKit+AFNetworking.h"; path = "UIKit+AFNetworking/UIKit+AFNetworking.h"; sourceTree = "<group>"; };
+		321953436B9349FCF7BF8964 /* Pods-OHHTTPStubs Mac Tests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-OHHTTPStubs Mac Tests-dummy.m"; sourceTree = "<group>"; };
+		3915011C479A0B120388E604 /* UIWebView+AFNetworking.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIWebView+AFNetworking.m"; path = "UIKit+AFNetworking/UIWebView+AFNetworking.m"; sourceTree = "<group>"; };
+		3CEE8864C15957F177F3E032 /* AFURLRequestSerialization.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFURLRequestSerialization.h; path = AFNetworking/AFURLRequestSerialization.h; sourceTree = "<group>"; };
+		3DC2B2A5E77746321B51034D /* UIActivityIndicatorView+AFNetworking.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIActivityIndicatorView+AFNetworking.h"; path = "UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.h"; sourceTree = "<group>"; };
+		3F8FF92F806E569F09F7C3CD /* Pods-OHHTTPStubs Mac Tests-environment.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-OHHTTPStubs Mac Tests-environment.h"; sourceTree = "<group>"; };
+		42A5AD26F924F2FB09A7D68A /* Pods-OHHTTPStubs iOS Tests-AFNetworking.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OHHTTPStubs iOS Tests-AFNetworking.xcconfig"; path = "../Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking.xcconfig"; sourceTree = "<group>"; };
+		497A151ED83BFF5C3E5B595D /* AFSecurityPolicy.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFSecurityPolicy.h; path = AFNetworking/AFSecurityPolicy.h; sourceTree = "<group>"; };
+		49BC80768F1ECB71168E4F0E /* AFNetworkReachabilityManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFNetworkReachabilityManager.h; path = AFNetworking/AFNetworkReachabilityManager.h; sourceTree = "<group>"; };
+		4B303111D0141201348C4833 /* AFURLSessionManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AFURLSessionManager.m; path = AFNetworking/AFURLSessionManager.m; sourceTree = "<group>"; };
+		4D7F0273765019AA5DEE864D /* Pods-OHHTTPStubs Mac Tests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-OHHTTPStubs Mac Tests-resources.sh"; sourceTree = "<group>"; };
+		4E571E4A2307F50521384E71 /* AFURLResponseSerialization.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AFURLResponseSerialization.m; path = AFNetworking/AFURLResponseSerialization.m; sourceTree = "<group>"; };
+		4FD3A50893C3DD6D814913A1 /* UIRefreshControl+AFNetworking.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIRefreshControl+AFNetworking.h"; path = "UIKit+AFNetworking/UIRefreshControl+AFNetworking.h"; sourceTree = "<group>"; };
+		505424A140C5A8E367324EB7 /* AFHTTPRequestOperation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFHTTPRequestOperation.h; path = AFNetworking/AFHTTPRequestOperation.h; sourceTree = "<group>"; };
+		51BD7E303C7824651C140D50 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
+		5447FF01A06FD20A36A2E25D /* AFURLRequestSerialization.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AFURLRequestSerialization.m; path = AFNetworking/AFURLRequestSerialization.m; sourceTree = "<group>"; };
+		551B551AA3280D6BA8335A95 /* UIActivityIndicatorView+AFNetworking.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIActivityIndicatorView+AFNetworking.m"; path = "UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.m"; sourceTree = "<group>"; };
+		55B5C6EAB2939CF9557557FB /* AFNetworkActivityIndicatorManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFNetworkActivityIndicatorManager.h; path = "UIKit+AFNetworking/AFNetworkActivityIndicatorManager.h"; sourceTree = "<group>"; };
+		560D9D22979DFBE868DEDD88 /* UIRefreshControl+AFNetworking.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIRefreshControl+AFNetworking.m"; path = "UIKit+AFNetworking/UIRefreshControl+AFNetworking.m"; sourceTree = "<group>"; };
+		57ADF24AEC45DB9B5B2B88EA /* AFURLConnectionOperation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFURLConnectionOperation.h; path = AFNetworking/AFURLConnectionOperation.h; sourceTree = "<group>"; };
+		589F6CBD907470D4ED9E48ED /* Pods-OHHTTPStubs Mac Tests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-OHHTTPStubs Mac Tests-acknowledgements.markdown"; sourceTree = "<group>"; };
+		5A54E4650469C5E299F0D89E /* AFHTTPRequestOperationManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AFHTTPRequestOperationManager.m; path = AFNetworking/AFHTTPRequestOperationManager.m; sourceTree = "<group>"; };
+		5D2AC08FFF124E07A01EAFC2 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/CoreServices.framework; sourceTree = DEVELOPER_DIR; };
+		5EA2CAEA9606CF3E2B7AC15F /* Pods-OHHTTPStubs iOS Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-OHHTTPStubs iOS Tests.debug.xcconfig"; sourceTree = "<group>"; };
+		6015221E4A360237C44A8015 /* AFURLResponseSerialization.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFURLResponseSerialization.h; path = AFNetworking/AFURLResponseSerialization.h; sourceTree = "<group>"; };
+		6C3004FE78D278EBD2159B2D /* UIImageView+AFNetworking.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIImageView+AFNetworking.m"; path = "UIKit+AFNetworking/UIImageView+AFNetworking.m"; sourceTree = "<group>"; };
+		6F25EDE9E451323B84AEED61 /* Pods-OHHTTPStubs iOS Tests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-OHHTTPStubs iOS Tests-resources.sh"; sourceTree = "<group>"; };
+		739C1918DF54A0F91712A4A6 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/CoreGraphics.framework; sourceTree = DEVELOPER_DIR; };
+		74DFB2792104932B42329735 /* Pods-OHHTTPStubs iOS Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-OHHTTPStubs iOS Tests.release.xcconfig"; sourceTree = "<group>"; };
+		7581CD963368C82A3138112D /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; };
+		762E066FFCD8D46681603BBB /* AFNetworkActivityIndicatorManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AFNetworkActivityIndicatorManager.m; path = "UIKit+AFNetworking/AFNetworkActivityIndicatorManager.m"; sourceTree = "<group>"; };
+		78B46767D42DDCD769A17785 /* libPods-OHHTTPStubs iOS Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OHHTTPStubs iOS Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		7ACAD995D17054176A5526B8 /* AFSecurityPolicy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AFSecurityPolicy.m; path = AFNetworking/AFSecurityPolicy.m; sourceTree = "<group>"; };
+		7C156A7437E431745406C066 /* AFURLConnectionOperation.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AFURLConnectionOperation.m; path = AFNetworking/AFURLConnectionOperation.m; sourceTree = "<group>"; };
+		7D0F6E023E9623249382E1A8 /* UIProgressView+AFNetworking.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIProgressView+AFNetworking.h"; path = "UIKit+AFNetworking/UIProgressView+AFNetworking.h"; sourceTree = "<group>"; };
+		88C39391AEC2A6F4CE298276 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
+		910E02E98AB0087421897E08 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/MobileCoreServices.framework; sourceTree = DEVELOPER_DIR; };
+		9A2F6C5D14D45DCC71486040 /* Pods-OHHTTPStubs Mac Tests-AFNetworking-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-OHHTTPStubs Mac Tests-AFNetworking-prefix.pch"; sourceTree = "<group>"; };
+		9ABBA795C17AC61F960788BE /* UIWebView+AFNetworking.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIWebView+AFNetworking.h"; path = "UIKit+AFNetworking/UIWebView+AFNetworking.h"; sourceTree = "<group>"; };
+		9E73E04B4EE7C8C760AE5357 /* libPods-OHHTTPStubs Mac Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OHHTTPStubs Mac Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		9FA4BA2FEF754E9D702A1150 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; };
+		9FB42624CAB24DF25D07AAE8 /* Pods-OHHTTPStubs Mac Tests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-OHHTTPStubs Mac Tests-acknowledgements.plist"; sourceTree = "<group>"; };
+		A6E08739E866C3624A421F65 /* AFNetworking.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFNetworking.h; path = AFNetworking/AFNetworking.h; sourceTree = "<group>"; };
+		B8CA917E680C843D80B254A4 /* Pods-OHHTTPStubs Mac Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-OHHTTPStubs Mac Tests.release.xcconfig"; sourceTree = "<group>"; };
+		BE5080D59238C5D11E0B4732 /* Pods-OHHTTPStubs iOS Tests-AFNetworking-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "Pods-OHHTTPStubs iOS Tests-AFNetworking-prefix.pch"; path = "../Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking-prefix.pch"; sourceTree = "<group>"; };
+		BF517ABC8323C43878EE5182 /* Pods-OHHTTPStubs iOS Tests-AFNetworking-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "Pods-OHHTTPStubs iOS Tests-AFNetworking-dummy.m"; path = "../Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking-dummy.m"; sourceTree = "<group>"; };
+		C024B152BB38AA08EF79BCA1 /* UIButton+AFNetworking.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIButton+AFNetworking.m"; path = "UIKit+AFNetworking/UIButton+AFNetworking.m"; sourceTree = "<group>"; };
+		CEA9DC40500CC7C2D1322784 /* UIImageView+AFNetworking.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIImageView+AFNetworking.h"; path = "UIKit+AFNetworking/UIImageView+AFNetworking.h"; sourceTree = "<group>"; };
+		D0B40D3B78D919B1D19604BC /* UIProgressView+AFNetworking.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIProgressView+AFNetworking.m"; path = "UIKit+AFNetworking/UIProgressView+AFNetworking.m"; sourceTree = "<group>"; };
+		D78D241677420BC40EAB1666 /* AFHTTPRequestOperation.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AFHTTPRequestOperation.m; path = AFNetworking/AFHTTPRequestOperation.m; sourceTree = "<group>"; };
+		D83EBBF184D064CDAD710A40 /* Pods-OHHTTPStubs iOS Tests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-OHHTTPStubs iOS Tests-dummy.m"; sourceTree = "<group>"; };
+		E3CB595356B57E21F6B502D2 /* AFHTTPSessionManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AFHTTPSessionManager.m; path = AFNetworking/AFHTTPSessionManager.m; sourceTree = "<group>"; };
+		ED516141A9266AEAAD48B422 /* UIAlertView+AFNetworking.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIAlertView+AFNetworking.m"; path = "UIKit+AFNetworking/UIAlertView+AFNetworking.m"; sourceTree = "<group>"; };
+		F23E7994981C3DACAAF7E45C /* UIAlertView+AFNetworking.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIAlertView+AFNetworking.h"; path = "UIKit+AFNetworking/UIAlertView+AFNetworking.h"; sourceTree = "<group>"; };
+		F29ED5E808F38B9662A3D952 /* Pods-OHHTTPStubs Mac Tests-AFNetworking-Private.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-OHHTTPStubs Mac Tests-AFNetworking-Private.xcconfig"; sourceTree = "<group>"; };
+		F35939851ED38CB5738C6911 /* AFNetworkReachabilityManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AFNetworkReachabilityManager.m; path = AFNetworking/AFNetworkReachabilityManager.m; sourceTree = "<group>"; };
+		F35D08450536F79059CA3B8F /* AFHTTPRequestOperationManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFHTTPRequestOperationManager.h; path = AFNetworking/AFHTTPRequestOperationManager.h; sourceTree = "<group>"; };
+		F4090349D8B910197D7DF11F /* Pods-OHHTTPStubs Mac Tests-AFNetworking-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-OHHTTPStubs Mac Tests-AFNetworking-dummy.m"; sourceTree = "<group>"; };
+		F8B3CC903D3CB9DDE04B17D4 /* UIButton+AFNetworking.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIButton+AFNetworking.h"; path = "UIKit+AFNetworking/UIButton+AFNetworking.h"; sourceTree = "<group>"; };
+		FD3A78B755B763DA38819067 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
+		FDC42A4A088707A78177FC59 /* libPods-OHHTTPStubs iOS Tests-AFNetworking.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OHHTTPStubs iOS Tests-AFNetworking.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		08C808FA697B8118DD3D19F9 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				E660CA7196C3AE15DA966314 /* CoreGraphics.framework in Frameworks */,
+				F558FDD298AA8E37CD4AD341 /* Foundation.framework in Frameworks */,
+				BF4EA978E0DB56CAF0A3D751 /* MobileCoreServices.framework in Frameworks */,
+				543C00C69B2B794A949F073F /* Security.framework in Frameworks */,
+				8763C4B08BB723B01752ED7A /* SystemConfiguration.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		2F46D4BF3329AFCC2E0ABF7F /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				F21FECFE160DC8796FCF20ED /* Cocoa.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		6E1895CAADD4CD67C0D35599 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				932CE4581D3CC4B038CCDC7B /* Cocoa.framework in Frameworks */,
+				6F1F3338B6C18B4B6A5FF672 /* CoreServices.framework in Frameworks */,
+				3BB9707D34A1B32642EB71FF /* Security.framework in Frameworks */,
+				D348E2D2580AA24B5E35DAC0 /* SystemConfiguration.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		97EF063BB4F1B51722BEEEEE /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				25142432152E0D0FC54821E0 /* Foundation.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		05169BCB42A2EF48FE2D19D5 /* Support Files */ = {
+			isa = PBXGroup;
+			children = (
+				29D3CFBC625C8949354A4766 /* Pods-OHHTTPStubs Mac Tests-AFNetworking.xcconfig */,
+				F29ED5E808F38B9662A3D952 /* Pods-OHHTTPStubs Mac Tests-AFNetworking-Private.xcconfig */,
+				F4090349D8B910197D7DF11F /* Pods-OHHTTPStubs Mac Tests-AFNetworking-dummy.m */,
+				9A2F6C5D14D45DCC71486040 /* Pods-OHHTTPStubs Mac Tests-AFNetworking-prefix.pch */,
+				42A5AD26F924F2FB09A7D68A /* Pods-OHHTTPStubs iOS Tests-AFNetworking.xcconfig */,
+				19D183DE47274EDE451A5BC5 /* Pods-OHHTTPStubs iOS Tests-AFNetworking-Private.xcconfig */,
+				BF517ABC8323C43878EE5182 /* Pods-OHHTTPStubs iOS Tests-AFNetworking-dummy.m */,
+				BE5080D59238C5D11E0B4732 /* Pods-OHHTTPStubs iOS Tests-AFNetworking-prefix.pch */,
+			);
+			name = "Support Files";
+			path = "../Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking";
+			sourceTree = "<group>";
+		};
+		070A94383B2AFA6C7D3962A7 /* NSURLConnection */ = {
+			isa = PBXGroup;
+			children = (
+				505424A140C5A8E367324EB7 /* AFHTTPRequestOperation.h */,
+				D78D241677420BC40EAB1666 /* AFHTTPRequestOperation.m */,
+				F35D08450536F79059CA3B8F /* AFHTTPRequestOperationManager.h */,
+				5A54E4650469C5E299F0D89E /* AFHTTPRequestOperationManager.m */,
+				57ADF24AEC45DB9B5B2B88EA /* AFURLConnectionOperation.h */,
+				7C156A7437E431745406C066 /* AFURLConnectionOperation.m */,
+			);
+			name = NSURLConnection;
+			sourceTree = "<group>";
+		};
+		2741788D7C16E4291B3E2737 /* AFNetworking */ = {
+			isa = PBXGroup;
+			children = (
+				A6E08739E866C3624A421F65 /* AFNetworking.h */,
+				070A94383B2AFA6C7D3962A7 /* NSURLConnection */,
+				4DF1A361DFF937F38D57611A /* NSURLSession */,
+				AD3758B807D8663FD2B641DA /* Reachability */,
+				644025E06DD06301D572A1DD /* Security */,
+				AD924DCA2EFDB9F9B379AF22 /* Serialization */,
+				05169BCB42A2EF48FE2D19D5 /* Support Files */,
+				C9A1F23AF6BE37E3FF2E4EE8 /* UIKit */,
+			);
+			path = AFNetworking;
+			sourceTree = "<group>";
+		};
+		3DC5022FE56EB79029E28B86 /* Pods-OHHTTPStubs iOS Tests */ = {
+			isa = PBXGroup;
+			children = (
+				1EDD5C86339F3D8A90DEEAD3 /* Pods-OHHTTPStubs iOS Tests-acknowledgements.markdown */,
+				14337C81A6290F7C528EA00B /* Pods-OHHTTPStubs iOS Tests-acknowledgements.plist */,
+				D83EBBF184D064CDAD710A40 /* Pods-OHHTTPStubs iOS Tests-dummy.m */,
+				0B163EB111AF4BAF3759BBA1 /* Pods-OHHTTPStubs iOS Tests-environment.h */,
+				6F25EDE9E451323B84AEED61 /* Pods-OHHTTPStubs iOS Tests-resources.sh */,
+				5EA2CAEA9606CF3E2B7AC15F /* Pods-OHHTTPStubs iOS Tests.debug.xcconfig */,
+				74DFB2792104932B42329735 /* Pods-OHHTTPStubs iOS Tests.release.xcconfig */,
+			);
+			name = "Pods-OHHTTPStubs iOS Tests";
+			path = "Target Support Files/Pods-OHHTTPStubs iOS Tests";
+			sourceTree = "<group>";
+		};
+		4C7E9800525AE6821F145253 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				2741788D7C16E4291B3E2737 /* AFNetworking */,
+			);
+			name = Pods;
+			sourceTree = "<group>";
+		};
+		4DF1A361DFF937F38D57611A /* NSURLSession */ = {
+			isa = PBXGroup;
+			children = (
+				093C199AD28717A653273DE0 /* AFHTTPSessionManager.h */,
+				E3CB595356B57E21F6B502D2 /* AFHTTPSessionManager.m */,
+				227A9F36B3754E843BA612D4 /* AFURLSessionManager.h */,
+				4B303111D0141201348C4833 /* AFURLSessionManager.m */,
+			);
+			name = NSURLSession;
+			sourceTree = "<group>";
+		};
+		4F22DE6DD75BB25D57A6F08C = {
+			isa = PBXGroup;
+			children = (
+				21559B0A80457F825BA4C039 /* Podfile */,
+				594802449485ED7FCDA90219 /* Frameworks */,
+				4C7E9800525AE6821F145253 /* Pods */,
+				840E1705B7F3F6B6B5CAA8C1 /* Products */,
+				76D31DB545556A7BCD8EB2F6 /* Targets Support Files */,
+			);
+			sourceTree = "<group>";
+		};
+		50238B3AF25CBF2261585387 /* iOS */ = {
+			isa = PBXGroup;
+			children = (
+				739C1918DF54A0F91712A4A6 /* CoreGraphics.framework */,
+				88C39391AEC2A6F4CE298276 /* Foundation.framework */,
+				910E02E98AB0087421897E08 /* MobileCoreServices.framework */,
+				FD3A78B755B763DA38819067 /* Security.framework */,
+				1D4DADF799A34500A06BD78A /* SystemConfiguration.framework */,
+			);
+			name = iOS;
+			sourceTree = "<group>";
+		};
+		594802449485ED7FCDA90219 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				EBF9743714B11144B2AFAA6A /* OS X */,
+				50238B3AF25CBF2261585387 /* iOS */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		644025E06DD06301D572A1DD /* Security */ = {
+			isa = PBXGroup;
+			children = (
+				497A151ED83BFF5C3E5B595D /* AFSecurityPolicy.h */,
+				7ACAD995D17054176A5526B8 /* AFSecurityPolicy.m */,
+			);
+			name = Security;
+			sourceTree = "<group>";
+		};
+		76D31DB545556A7BCD8EB2F6 /* Targets Support Files */ = {
+			isa = PBXGroup;
+			children = (
+				D5658B605F60D854FF21EBF8 /* Pods-OHHTTPStubs Mac Tests */,
+				3DC5022FE56EB79029E28B86 /* Pods-OHHTTPStubs iOS Tests */,
+			);
+			name = "Targets Support Files";
+			sourceTree = "<group>";
+		};
+		840E1705B7F3F6B6B5CAA8C1 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				9E73E04B4EE7C8C760AE5357 /* libPods-OHHTTPStubs Mac Tests.a */,
+				00B451C5114FF92A77CC1279 /* libPods-OHHTTPStubs Mac Tests-AFNetworking.a */,
+				78B46767D42DDCD769A17785 /* libPods-OHHTTPStubs iOS Tests.a */,
+				FDC42A4A088707A78177FC59 /* libPods-OHHTTPStubs iOS Tests-AFNetworking.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		AD3758B807D8663FD2B641DA /* Reachability */ = {
+			isa = PBXGroup;
+			children = (
+				49BC80768F1ECB71168E4F0E /* AFNetworkReachabilityManager.h */,
+				F35939851ED38CB5738C6911 /* AFNetworkReachabilityManager.m */,
+			);
+			name = Reachability;
+			sourceTree = "<group>";
+		};
+		AD924DCA2EFDB9F9B379AF22 /* Serialization */ = {
+			isa = PBXGroup;
+			children = (
+				3CEE8864C15957F177F3E032 /* AFURLRequestSerialization.h */,
+				5447FF01A06FD20A36A2E25D /* AFURLRequestSerialization.m */,
+				6015221E4A360237C44A8015 /* AFURLResponseSerialization.h */,
+				4E571E4A2307F50521384E71 /* AFURLResponseSerialization.m */,
+			);
+			name = Serialization;
+			sourceTree = "<group>";
+		};
+		C9A1F23AF6BE37E3FF2E4EE8 /* UIKit */ = {
+			isa = PBXGroup;
+			children = (
+				55B5C6EAB2939CF9557557FB /* AFNetworkActivityIndicatorManager.h */,
+				762E066FFCD8D46681603BBB /* AFNetworkActivityIndicatorManager.m */,
+				3DC2B2A5E77746321B51034D /* UIActivityIndicatorView+AFNetworking.h */,
+				551B551AA3280D6BA8335A95 /* UIActivityIndicatorView+AFNetworking.m */,
+				F23E7994981C3DACAAF7E45C /* UIAlertView+AFNetworking.h */,
+				ED516141A9266AEAAD48B422 /* UIAlertView+AFNetworking.m */,
+				F8B3CC903D3CB9DDE04B17D4 /* UIButton+AFNetworking.h */,
+				C024B152BB38AA08EF79BCA1 /* UIButton+AFNetworking.m */,
+				CEA9DC40500CC7C2D1322784 /* UIImageView+AFNetworking.h */,
+				6C3004FE78D278EBD2159B2D /* UIImageView+AFNetworking.m */,
+				2E983A5C6230930CDB296DFA /* UIKit+AFNetworking.h */,
+				7D0F6E023E9623249382E1A8 /* UIProgressView+AFNetworking.h */,
+				D0B40D3B78D919B1D19604BC /* UIProgressView+AFNetworking.m */,
+				4FD3A50893C3DD6D814913A1 /* UIRefreshControl+AFNetworking.h */,
+				560D9D22979DFBE868DEDD88 /* UIRefreshControl+AFNetworking.m */,
+				9ABBA795C17AC61F960788BE /* UIWebView+AFNetworking.h */,
+				3915011C479A0B120388E604 /* UIWebView+AFNetworking.m */,
+			);
+			name = UIKit;
+			sourceTree = "<group>";
+		};
+		D5658B605F60D854FF21EBF8 /* Pods-OHHTTPStubs Mac Tests */ = {
+			isa = PBXGroup;
+			children = (
+				589F6CBD907470D4ED9E48ED /* Pods-OHHTTPStubs Mac Tests-acknowledgements.markdown */,
+				9FB42624CAB24DF25D07AAE8 /* Pods-OHHTTPStubs Mac Tests-acknowledgements.plist */,
+				321953436B9349FCF7BF8964 /* Pods-OHHTTPStubs Mac Tests-dummy.m */,
+				3F8FF92F806E569F09F7C3CD /* Pods-OHHTTPStubs Mac Tests-environment.h */,
+				4D7F0273765019AA5DEE864D /* Pods-OHHTTPStubs Mac Tests-resources.sh */,
+				274F152996A2D6D92762AAFC /* Pods-OHHTTPStubs Mac Tests.debug.xcconfig */,
+				B8CA917E680C843D80B254A4 /* Pods-OHHTTPStubs Mac Tests.release.xcconfig */,
+			);
+			name = "Pods-OHHTTPStubs Mac Tests";
+			path = "Target Support Files/Pods-OHHTTPStubs Mac Tests";
+			sourceTree = "<group>";
+		};
+		EBF9743714B11144B2AFAA6A /* OS X */ = {
+			isa = PBXGroup;
+			children = (
+				9FA4BA2FEF754E9D702A1150 /* Cocoa.framework */,
+				5D2AC08FFF124E07A01EAFC2 /* CoreServices.framework */,
+				51BD7E303C7824651C140D50 /* Security.framework */,
+				7581CD963368C82A3138112D /* SystemConfiguration.framework */,
+			);
+			name = "OS X";
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		256F5FE3B2E18567D1F66C08 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				754E33A6C10F46A7A36092D8 /* AFHTTPRequestOperation.h in Headers */,
+				37C0EFD701AE7760758BD7DC /* AFHTTPRequestOperationManager.h in Headers */,
+				20CD2FEFF175371C94C52D11 /* AFHTTPSessionManager.h in Headers */,
+				09696F6B38AF4AA07130BDA5 /* AFNetworkReachabilityManager.h in Headers */,
+				5D38932376ACB1D542540DE8 /* AFNetworking.h in Headers */,
+				3F7B393D7F0475C76239AEF5 /* AFSecurityPolicy.h in Headers */,
+				FA6A84FB2D6AF1D3183C1373 /* AFURLConnectionOperation.h in Headers */,
+				F6043955003537905B134B62 /* AFURLRequestSerialization.h in Headers */,
+				A89EEDF58A1E524677F157AA /* AFURLResponseSerialization.h in Headers */,
+				EC557A30CAD5634B82D54AED /* AFURLSessionManager.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9C373A2E563593F432AD79C /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				522A96083A107EBDABC5A8E3 /* AFHTTPRequestOperation.h in Headers */,
+				0ED74CA078B559E46733EB86 /* AFHTTPRequestOperationManager.h in Headers */,
+				E2ED8AB618422BC864886DCB /* AFHTTPSessionManager.h in Headers */,
+				9A5155FDA741A40E62176688 /* AFNetworkActivityIndicatorManager.h in Headers */,
+				07109DEE2D3CCAC6E27FF610 /* AFNetworkReachabilityManager.h in Headers */,
+				58C2691912FAE6112F221A24 /* AFNetworking.h in Headers */,
+				0B0AC3DCF875ACE1AB25DB06 /* AFSecurityPolicy.h in Headers */,
+				4702916A49A441A9A944E912 /* AFURLConnectionOperation.h in Headers */,
+				578705629C31E0FC3C99ACB5 /* AFURLRequestSerialization.h in Headers */,
+				4870AB9943E61FC2D614B70D /* AFURLResponseSerialization.h in Headers */,
+				B917CE9E60F38DA6AE956D10 /* AFURLSessionManager.h in Headers */,
+				4F01C6D7B6853EF4AA5B65C0 /* UIActivityIndicatorView+AFNetworking.h in Headers */,
+				9EF6386D389001640865A6A0 /* UIAlertView+AFNetworking.h in Headers */,
+				AB53CB4E94CC50F54326D9EC /* UIButton+AFNetworking.h in Headers */,
+				07C1C70C97F4B12085CF9B54 /* UIImageView+AFNetworking.h in Headers */,
+				D999D52BA23C8B7FC607D108 /* UIKit+AFNetworking.h in Headers */,
+				111FA2DCCECDC450CCE86B79 /* UIProgressView+AFNetworking.h in Headers */,
+				CCBEB7124FE5B8E0772ACFBD /* UIRefreshControl+AFNetworking.h in Headers */,
+				FEFED9420F6A72FB3F123BF5 /* UIWebView+AFNetworking.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		11C6440715C5C37466193A71 /* Pods-OHHTTPStubs Mac Tests-AFNetworking */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A66489F018353B6058D4D8CF /* Build configuration list for PBXNativeTarget "Pods-OHHTTPStubs Mac Tests-AFNetworking" */;
+			buildPhases = (
+				20F1F831CA391CB98DA7148C /* Sources */,
+				6E1895CAADD4CD67C0D35599 /* Frameworks */,
+				256F5FE3B2E18567D1F66C08 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "Pods-OHHTTPStubs Mac Tests-AFNetworking";
+			productName = "Pods-OHHTTPStubs Mac Tests-AFNetworking";
+			productReference = 00B451C5114FF92A77CC1279 /* libPods-OHHTTPStubs Mac Tests-AFNetworking.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+		5A989F1DC87EA18917A83ED3 /* Pods-OHHTTPStubs Mac Tests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = D1FCAD37DEA7C4E61C26DF3B /* Build configuration list for PBXNativeTarget "Pods-OHHTTPStubs Mac Tests" */;
+			buildPhases = (
+				114ABB025720040B090F8BC3 /* Sources */,
+				2F46D4BF3329AFCC2E0ABF7F /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				1EA3D04C16DB6059C82BFBA1 /* PBXTargetDependency */,
+			);
+			name = "Pods-OHHTTPStubs Mac Tests";
+			productName = "Pods-OHHTTPStubs Mac Tests";
+			productReference = 9E73E04B4EE7C8C760AE5357 /* libPods-OHHTTPStubs Mac Tests.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+		F692E0F1F69A02A187429A81 /* Pods-OHHTTPStubs iOS Tests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = EFA235A59A8027AB996E0D6B /* Build configuration list for PBXNativeTarget "Pods-OHHTTPStubs iOS Tests" */;
+			buildPhases = (
+				4DB617D0D63B727656D14BC6 /* Sources */,
+				97EF063BB4F1B51722BEEEEE /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				0A6A94A7B2C7311729278CD0 /* PBXTargetDependency */,
+			);
+			name = "Pods-OHHTTPStubs iOS Tests";
+			productName = "Pods-OHHTTPStubs iOS Tests";
+			productReference = 78B46767D42DDCD769A17785 /* libPods-OHHTTPStubs iOS Tests.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+		FFE6CE2F3BF00868F830AF0D /* Pods-OHHTTPStubs iOS Tests-AFNetworking */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 16E1077524B3F86733F1A5AE /* Build configuration list for PBXNativeTarget "Pods-OHHTTPStubs iOS Tests-AFNetworking" */;
+			buildPhases = (
+				B84BB191C7AF13939DF58349 /* Sources */,
+				08C808FA697B8118DD3D19F9 /* Frameworks */,
+				A9C373A2E563593F432AD79C /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "Pods-OHHTTPStubs iOS Tests-AFNetworking";
+			productName = "Pods-OHHTTPStubs iOS Tests-AFNetworking";
+			productReference = FDC42A4A088707A78177FC59 /* libPods-OHHTTPStubs iOS Tests-AFNetworking.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		E0DDD61A0770FF4B6366DB86 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0640;
+			};
+			buildConfigurationList = B1768547D52EBBCE2FF93150 /* Build configuration list for PBXProject "Pods" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 4F22DE6DD75BB25D57A6F08C;
+			productRefGroup = 840E1705B7F3F6B6B5CAA8C1 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				5A989F1DC87EA18917A83ED3 /* Pods-OHHTTPStubs Mac Tests */,
+				11C6440715C5C37466193A71 /* Pods-OHHTTPStubs Mac Tests-AFNetworking */,
+				F692E0F1F69A02A187429A81 /* Pods-OHHTTPStubs iOS Tests */,
+				FFE6CE2F3BF00868F830AF0D /* Pods-OHHTTPStubs iOS Tests-AFNetworking */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		114ABB025720040B090F8BC3 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				77D3C6F11D2CA0A86A3EAF29 /* Pods-OHHTTPStubs Mac Tests-dummy.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		20F1F831CA391CB98DA7148C /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8F6FABABA39F6EB2B25939F3 /* AFHTTPRequestOperation.m in Sources */,
+				63359255DE4DAB8D48D8398A /* AFHTTPRequestOperationManager.m in Sources */,
+				9B3D20C65197332A7B9D7A10 /* AFHTTPSessionManager.m in Sources */,
+				12614473A129EE388A04B562 /* AFNetworkReachabilityManager.m in Sources */,
+				B15E5A587912F49A725192DA /* AFSecurityPolicy.m in Sources */,
+				BEE8719A65D2BF151C8FF1B1 /* AFURLConnectionOperation.m in Sources */,
+				05F10BA864A937B79CEF7AB7 /* AFURLRequestSerialization.m in Sources */,
+				1B0340808D17594E7E20416E /* AFURLResponseSerialization.m in Sources */,
+				D1803A9D2201964C36D553F2 /* AFURLSessionManager.m in Sources */,
+				C494DB10D68900498C06D033 /* Pods-OHHTTPStubs Mac Tests-AFNetworking-dummy.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		4DB617D0D63B727656D14BC6 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				81ADB8C804615D4048C91FDD /* Pods-OHHTTPStubs iOS Tests-dummy.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		B84BB191C7AF13939DF58349 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				88512D9EC7516213FBEEDFE1 /* AFHTTPRequestOperation.m in Sources */,
+				F4F2BA5E80803A456F424CA8 /* AFHTTPRequestOperationManager.m in Sources */,
+				B24CEF9198BE0DFD988FFCC8 /* AFHTTPSessionManager.m in Sources */,
+				E36FCA4D3E27E2FFA7E5A27B /* AFNetworkActivityIndicatorManager.m in Sources */,
+				4900C036A4BF4E5C2EA93B03 /* AFNetworkReachabilityManager.m in Sources */,
+				96F3BAB009B5A271F0A4CAD7 /* AFSecurityPolicy.m in Sources */,
+				44648DED9CBCDDE10E27F589 /* AFURLConnectionOperation.m in Sources */,
+				1A69E8016FF6786724EA2DA5 /* AFURLRequestSerialization.m in Sources */,
+				F04762E2C44454C499EA9042 /* AFURLResponseSerialization.m in Sources */,
+				E4DD261A8784962967035ABE /* AFURLSessionManager.m in Sources */,
+				0D8DD2899735197CB2EDFC53 /* Pods-OHHTTPStubs iOS Tests-AFNetworking-dummy.m in Sources */,
+				2B8F7B192A59BAAF912AE712 /* UIActivityIndicatorView+AFNetworking.m in Sources */,
+				85B667118C68BEDF6F983AFC /* UIAlertView+AFNetworking.m in Sources */,
+				50C3B855E98EA0044351A87B /* UIButton+AFNetworking.m in Sources */,
+				5FFE1317E23BD6A2F1739550 /* UIImageView+AFNetworking.m in Sources */,
+				2A341F22AECC9350634749A9 /* UIProgressView+AFNetworking.m in Sources */,
+				92DADB41EC0F2CE69047AB84 /* UIRefreshControl+AFNetworking.m in Sources */,
+				94ABFD6DD946F56D219ADC22 /* UIWebView+AFNetworking.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		0A6A94A7B2C7311729278CD0 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = "Pods-OHHTTPStubs iOS Tests-AFNetworking";
+			target = FFE6CE2F3BF00868F830AF0D /* Pods-OHHTTPStubs iOS Tests-AFNetworking */;
+			targetProxy = F877A0D43CD157C66D5C6BB5 /* PBXContainerItemProxy */;
+		};
+		1EA3D04C16DB6059C82BFBA1 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = "Pods-OHHTTPStubs Mac Tests-AFNetworking";
+			target = 11C6440715C5C37466193A71 /* Pods-OHHTTPStubs Mac Tests-AFNetworking */;
+			targetProxy = C627703060BD61C91F2A4C64 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin XCBuildConfiguration section */
+		1FFF8AA98B0E9F51AF0A4CE0 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 5EA2CAEA9606CF3E2B7AC15F /* Pods-OHHTTPStubs iOS Tests.debug.xcconfig */;
+			buildSettings = {
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+			};
+			name = Debug;
+		};
+		377FFB69F9741DDB7D6B51A4 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = YES;
+				ENABLE_NS_ASSERTIONS = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_PREPROCESSOR_DEFINITIONS = "RELEASE=1";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				STRIP_INSTALLED_PRODUCT = NO;
+				SYMROOT = "${SRCROOT}/../build";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		42B00731E778630AB234053B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = F29ED5E808F38B9662A3D952 /* Pods-OHHTTPStubs Mac Tests-AFNetworking-Private.xcconfig */;
+			buildSettings = {
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				EXECUTABLE_PREFIX = lib;
+				GCC_PREFIX_HEADER = "Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking-prefix.pch";
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		4BA8335C897812C11D5A8C31 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 74DFB2792104932B42329735 /* Pods-OHHTTPStubs iOS Tests.release.xcconfig */;
+			buildSettings = {
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+			};
+			name = Release;
+		};
+		A9A3FF96249A9958252BB1F6 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 19D183DE47274EDE451A5BC5 /* Pods-OHHTTPStubs iOS Tests-AFNetworking-Private.xcconfig */;
+			buildSettings = {
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_PREFIX_HEADER = "Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking-prefix.pch";
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+			};
+			name = Release;
+		};
+		C49CFB955A1420ECBCD0BFDF /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 19D183DE47274EDE451A5BC5 /* Pods-OHHTTPStubs iOS Tests-AFNetworking-Private.xcconfig */;
+			buildSettings = {
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_PREFIX_HEADER = "Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking-prefix.pch";
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+			};
+			name = Debug;
+		};
+		C9BD9E8F4CC2D9BCDC661322 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = B8CA917E680C843D80B254A4 /* Pods-OHHTTPStubs Mac Tests.release.xcconfig */;
+			buildSettings = {
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				EXECUTABLE_PREFIX = lib;
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				SKIP_INSTALL = YES;
+			};
+			name = Release;
+		};
+		E2F6597E58383F288EE79539 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = F29ED5E808F38B9662A3D952 /* Pods-OHHTTPStubs Mac Tests-AFNetworking-Private.xcconfig */;
+			buildSettings = {
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				EXECUTABLE_PREFIX = lib;
+				GCC_PREFIX_HEADER = "Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking-prefix.pch";
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		E2FCAC7CA6D459AA427B170B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				ONLY_ACTIVE_ARCH = YES;
+				STRIP_INSTALLED_PRODUCT = NO;
+				SYMROOT = "${SRCROOT}/../build";
+			};
+			name = Debug;
+		};
+		F28053CEB69826456475093D /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 274F152996A2D6D92762AAFC /* Pods-OHHTTPStubs Mac Tests.debug.xcconfig */;
+			buildSettings = {
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				EXECUTABLE_PREFIX = lib;
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				SKIP_INSTALL = YES;
+			};
+			name = Debug;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		16E1077524B3F86733F1A5AE /* Build configuration list for PBXNativeTarget "Pods-OHHTTPStubs iOS Tests-AFNetworking" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C49CFB955A1420ECBCD0BFDF /* Debug */,
+				A9A3FF96249A9958252BB1F6 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		A66489F018353B6058D4D8CF /* Build configuration list for PBXNativeTarget "Pods-OHHTTPStubs Mac Tests-AFNetworking" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				42B00731E778630AB234053B /* Debug */,
+				E2F6597E58383F288EE79539 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		B1768547D52EBBCE2FF93150 /* Build configuration list for PBXProject "Pods" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				E2FCAC7CA6D459AA427B170B /* Debug */,
+				377FFB69F9741DDB7D6B51A4 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		D1FCAD37DEA7C4E61C26DF3B /* Build configuration list for PBXNativeTarget "Pods-OHHTTPStubs Mac Tests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				F28053CEB69826456475093D /* Debug */,
+				C9BD9E8F4CC2D9BCDC661322 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		EFA235A59A8027AB996E0D6B /* Build configuration list for PBXNativeTarget "Pods-OHHTTPStubs iOS Tests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				1FFF8AA98B0E9F51AF0A4CE0 /* Debug */,
+				4BA8335C897812C11D5A8C31 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = E0DDD61A0770FF4B6366DB86 /* Project object */;
+}
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking-Private.xcconfig b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking-Private.xcconfig
new file mode 100644
index 000000000..a254ef11b
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking-Private.xcconfig	
@@ -0,0 +1,6 @@
+#include "Pods-OHHTTPStubs Mac Tests-AFNetworking.xcconfig"
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/AFNetworking" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking"
+OTHER_LDFLAGS = ${PODS_OHHTTPSTUBS_MAC_TESTS_AFNETWORKING_OTHER_LDFLAGS} -ObjC
+PODS_ROOT = ${SRCROOT}
+SKIP_INSTALL = YES
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking-dummy.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking-dummy.m
new file mode 100644
index 000000000..2de591a2e
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking-dummy.m	
@@ -0,0 +1,5 @@
+#import <Foundation/Foundation.h>
+@interface PodsDummy_Pods_OHHTTPStubs_Mac_Tests_AFNetworking : NSObject
+@end
+@implementation PodsDummy_Pods_OHHTTPStubs_Mac_Tests_AFNetworking
+@end
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking-prefix.pch b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking-prefix.pch
new file mode 100644
index 000000000..043318bf1
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking-prefix.pch	
@@ -0,0 +1,5 @@
+#ifdef __OBJC__
+#import <Cocoa/Cocoa.h>
+#endif
+
+#import "Pods-OHHTTPStubs Mac Tests-environment.h"
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking.xcconfig b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking.xcconfig
new file mode 100644
index 000000000..1fb0c387d
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking.xcconfig	
@@ -0,0 +1 @@
+PODS_OHHTTPSTUBS_MAC_TESTS_AFNETWORKING_OTHER_LDFLAGS = -framework "CoreServices" -framework "Security" -framework "SystemConfiguration"
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-acknowledgements.markdown b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-acknowledgements.markdown
new file mode 100644
index 000000000..59a175087
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-acknowledgements.markdown	
@@ -0,0 +1,26 @@
+# Acknowledgements
+This application makes use of the following third party libraries:
+
+## AFNetworking
+
+Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com/)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+Generated by CocoaPods - http://cocoapods.org
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-acknowledgements.plist b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-acknowledgements.plist
new file mode 100644
index 000000000..899e8ae43
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-acknowledgements.plist	
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreferenceSpecifiers</key>
+	<array>
+		<dict>
+			<key>FooterText</key>
+			<string>This application makes use of the following third party libraries:</string>
+			<key>Title</key>
+			<string>Acknowledgements</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com/)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+</string>
+			<key>Title</key>
+			<string>AFNetworking</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>Generated by CocoaPods - http://cocoapods.org</string>
+			<key>Title</key>
+			<string></string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+	</array>
+	<key>StringsTable</key>
+	<string>Acknowledgements</string>
+	<key>Title</key>
+	<string>Acknowledgements</string>
+</dict>
+</plist>
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-dummy.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-dummy.m
new file mode 100644
index 000000000..f124d0bf5
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-dummy.m	
@@ -0,0 +1,5 @@
+#import <Foundation/Foundation.h>
+@interface PodsDummy_Pods_OHHTTPStubs_Mac_Tests : NSObject
+@end
+@implementation PodsDummy_Pods_OHHTTPStubs_Mac_Tests
+@end
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-environment.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-environment.h
new file mode 100644
index 000000000..42c1cb911
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-environment.h	
@@ -0,0 +1,44 @@
+
+// To check if a library is compiled with CocoaPods you
+// can use the `COCOAPODS` macro definition which is
+// defined in the xcconfigs so it is available in
+// headers also when they are imported in the client
+// project.
+
+
+// AFNetworking
+#define COCOAPODS_POD_AVAILABLE_AFNetworking
+#define COCOAPODS_VERSION_MAJOR_AFNetworking 2
+#define COCOAPODS_VERSION_MINOR_AFNetworking 5
+#define COCOAPODS_VERSION_PATCH_AFNetworking 0
+
+// AFNetworking/NSURLConnection
+#define COCOAPODS_POD_AVAILABLE_AFNetworking_NSURLConnection
+#define COCOAPODS_VERSION_MAJOR_AFNetworking_NSURLConnection 2
+#define COCOAPODS_VERSION_MINOR_AFNetworking_NSURLConnection 5
+#define COCOAPODS_VERSION_PATCH_AFNetworking_NSURLConnection 0
+
+// AFNetworking/NSURLSession
+#define COCOAPODS_POD_AVAILABLE_AFNetworking_NSURLSession
+#define COCOAPODS_VERSION_MAJOR_AFNetworking_NSURLSession 2
+#define COCOAPODS_VERSION_MINOR_AFNetworking_NSURLSession 5
+#define COCOAPODS_VERSION_PATCH_AFNetworking_NSURLSession 0
+
+// AFNetworking/Reachability
+#define COCOAPODS_POD_AVAILABLE_AFNetworking_Reachability
+#define COCOAPODS_VERSION_MAJOR_AFNetworking_Reachability 2
+#define COCOAPODS_VERSION_MINOR_AFNetworking_Reachability 5
+#define COCOAPODS_VERSION_PATCH_AFNetworking_Reachability 0
+
+// AFNetworking/Security
+#define COCOAPODS_POD_AVAILABLE_AFNetworking_Security
+#define COCOAPODS_VERSION_MAJOR_AFNetworking_Security 2
+#define COCOAPODS_VERSION_MINOR_AFNetworking_Security 5
+#define COCOAPODS_VERSION_PATCH_AFNetworking_Security 0
+
+// AFNetworking/Serialization
+#define COCOAPODS_POD_AVAILABLE_AFNetworking_Serialization
+#define COCOAPODS_VERSION_MAJOR_AFNetworking_Serialization 2
+#define COCOAPODS_VERSION_MINOR_AFNetworking_Serialization 5
+#define COCOAPODS_VERSION_PATCH_AFNetworking_Serialization 0
+
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-resources.sh b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-resources.sh
new file mode 100755
index 000000000..43f08523e
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-resources.sh	
@@ -0,0 +1,93 @@
+#!/bin/sh
+set -e
+
+mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+
+RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
+> "$RESOURCES_TO_COPY"
+
+XCASSET_FILES=()
+
+realpath() {
+  DIRECTORY=$(cd "${1%/*}" && pwd)
+  FILENAME="${1##*/}"
+  echo "$DIRECTORY/$FILENAME"
+}
+
+install_resource()
+{
+  case $1 in
+    *.storyboard)
+      echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc ${PODS_ROOT}/$1 --sdk ${SDKROOT}"
+      ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc" "${PODS_ROOT}/$1" --sdk "${SDKROOT}"
+      ;;
+    *.xib)
+        echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib ${PODS_ROOT}/$1 --sdk ${SDKROOT}"
+      ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib" "${PODS_ROOT}/$1" --sdk "${SDKROOT}"
+      ;;
+    *.framework)
+      echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      echo "rsync -av ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      rsync -av "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      ;;
+    *.xcdatamodel)
+      echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1"`.mom\""
+      xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodel`.mom"
+      ;;
+    *.xcdatamodeld)
+      echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd\""
+      xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd"
+      ;;
+    *.xcmappingmodel)
+      echo "xcrun mapc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm\""
+      xcrun mapc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm"
+      ;;
+    *.xcassets)
+      ABSOLUTE_XCASSET_FILE=$(realpath "${PODS_ROOT}/$1")
+      XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
+      ;;
+    /*)
+      echo "$1"
+      echo "$1" >> "$RESOURCES_TO_COPY"
+      ;;
+    *)
+      echo "${PODS_ROOT}/$1"
+      echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY"
+      ;;
+  esac
+}
+
+rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+if [[ "${ACTION}" == "install" ]]; then
+  rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+fi
+rm -f "$RESOURCES_TO_COPY"
+
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
+then
+  case "${TARGETED_DEVICE_FAMILY}" in
+    1,2)
+      TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
+      ;;
+    1)
+      TARGET_DEVICE_ARGS="--target-device iphone"
+      ;;
+    2)
+      TARGET_DEVICE_ARGS="--target-device ipad"
+      ;;
+    *)
+      TARGET_DEVICE_ARGS="--target-device mac"
+      ;;
+  esac
+
+  # Find all other xcassets (this unfortunately includes those of path pods and other targets).
+  OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
+  while read line; do
+    if [[ $line != "`realpath $PODS_ROOT`*" ]]; then
+      XCASSET_FILES+=("$line")
+    fi
+  done <<<"$OTHER_XCASSETS"
+
+  printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${IPHONEOS_DEPLOYMENT_TARGET}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+fi
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests.debug.xcconfig b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests.debug.xcconfig
new file mode 100644
index 000000000..72f9cec4a
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests.debug.xcconfig	
@@ -0,0 +1,6 @@
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking"
+OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking"
+OTHER_LDFLAGS = $(inherited) -ObjC -l"Pods-OHHTTPStubs Mac Tests-AFNetworking" -framework "CoreServices" -framework "Security" -framework "SystemConfiguration"
+OTHER_LIBTOOLFLAGS = $(OTHER_LDFLAGS)
+PODS_ROOT = ${SRCROOT}/Pods
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests.release.xcconfig b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests.release.xcconfig
new file mode 100644
index 000000000..72f9cec4a
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests.release.xcconfig	
@@ -0,0 +1,6 @@
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking"
+OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking"
+OTHER_LDFLAGS = $(inherited) -ObjC -l"Pods-OHHTTPStubs Mac Tests-AFNetworking" -framework "CoreServices" -framework "Security" -framework "SystemConfiguration"
+OTHER_LIBTOOLFLAGS = $(OTHER_LDFLAGS)
+PODS_ROOT = ${SRCROOT}/Pods
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking-Private.xcconfig b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking-Private.xcconfig
new file mode 100644
index 000000000..6f4361172
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking-Private.xcconfig	
@@ -0,0 +1,6 @@
+#include "Pods-OHHTTPStubs iOS Tests-AFNetworking.xcconfig"
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/AFNetworking" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking"
+OTHER_LDFLAGS = ${PODS_OHHTTPSTUBS_IOS_TESTS_AFNETWORKING_OTHER_LDFLAGS} -ObjC
+PODS_ROOT = ${SRCROOT}
+SKIP_INSTALL = YES
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking-dummy.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking-dummy.m
new file mode 100644
index 000000000..8aa49d138
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking-dummy.m	
@@ -0,0 +1,5 @@
+#import <Foundation/Foundation.h>
+@interface PodsDummy_Pods_OHHTTPStubs_iOS_Tests_AFNetworking : NSObject
+@end
+@implementation PodsDummy_Pods_OHHTTPStubs_iOS_Tests_AFNetworking
+@end
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking-prefix.pch b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking-prefix.pch
new file mode 100644
index 000000000..80fbb8dc3
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking-prefix.pch	
@@ -0,0 +1,5 @@
+#ifdef __OBJC__
+#import <UIKit/UIKit.h>
+#endif
+
+#import "Pods-OHHTTPStubs iOS Tests-environment.h"
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking.xcconfig b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking.xcconfig
new file mode 100644
index 000000000..b8aeea85b
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking.xcconfig	
@@ -0,0 +1 @@
+PODS_OHHTTPSTUBS_IOS_TESTS_AFNETWORKING_OTHER_LDFLAGS = -framework "CoreGraphics" -framework "MobileCoreServices" -framework "Security" -framework "SystemConfiguration"
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-acknowledgements.markdown b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-acknowledgements.markdown
new file mode 100644
index 000000000..59a175087
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-acknowledgements.markdown	
@@ -0,0 +1,26 @@
+# Acknowledgements
+This application makes use of the following third party libraries:
+
+## AFNetworking
+
+Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com/)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+Generated by CocoaPods - http://cocoapods.org
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-acknowledgements.plist b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-acknowledgements.plist
new file mode 100644
index 000000000..899e8ae43
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-acknowledgements.plist	
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreferenceSpecifiers</key>
+	<array>
+		<dict>
+			<key>FooterText</key>
+			<string>This application makes use of the following third party libraries:</string>
+			<key>Title</key>
+			<string>Acknowledgements</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>Copyright (c) 2013-2014 AFNetworking (http://afnetworking.com/)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+</string>
+			<key>Title</key>
+			<string>AFNetworking</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>Generated by CocoaPods - http://cocoapods.org</string>
+			<key>Title</key>
+			<string></string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+	</array>
+	<key>StringsTable</key>
+	<string>Acknowledgements</string>
+	<key>Title</key>
+	<string>Acknowledgements</string>
+</dict>
+</plist>
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-dummy.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-dummy.m
new file mode 100644
index 000000000..0fb6509a9
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-dummy.m	
@@ -0,0 +1,5 @@
+#import <Foundation/Foundation.h>
+@interface PodsDummy_Pods_OHHTTPStubs_iOS_Tests : NSObject
+@end
+@implementation PodsDummy_Pods_OHHTTPStubs_iOS_Tests
+@end
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-environment.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-environment.h
new file mode 100644
index 000000000..e1a5d47d3
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-environment.h	
@@ -0,0 +1,50 @@
+
+// To check if a library is compiled with CocoaPods you
+// can use the `COCOAPODS` macro definition which is
+// defined in the xcconfigs so it is available in
+// headers also when they are imported in the client
+// project.
+
+
+// AFNetworking
+#define COCOAPODS_POD_AVAILABLE_AFNetworking
+#define COCOAPODS_VERSION_MAJOR_AFNetworking 2
+#define COCOAPODS_VERSION_MINOR_AFNetworking 5
+#define COCOAPODS_VERSION_PATCH_AFNetworking 0
+
+// AFNetworking/NSURLConnection
+#define COCOAPODS_POD_AVAILABLE_AFNetworking_NSURLConnection
+#define COCOAPODS_VERSION_MAJOR_AFNetworking_NSURLConnection 2
+#define COCOAPODS_VERSION_MINOR_AFNetworking_NSURLConnection 5
+#define COCOAPODS_VERSION_PATCH_AFNetworking_NSURLConnection 0
+
+// AFNetworking/NSURLSession
+#define COCOAPODS_POD_AVAILABLE_AFNetworking_NSURLSession
+#define COCOAPODS_VERSION_MAJOR_AFNetworking_NSURLSession 2
+#define COCOAPODS_VERSION_MINOR_AFNetworking_NSURLSession 5
+#define COCOAPODS_VERSION_PATCH_AFNetworking_NSURLSession 0
+
+// AFNetworking/Reachability
+#define COCOAPODS_POD_AVAILABLE_AFNetworking_Reachability
+#define COCOAPODS_VERSION_MAJOR_AFNetworking_Reachability 2
+#define COCOAPODS_VERSION_MINOR_AFNetworking_Reachability 5
+#define COCOAPODS_VERSION_PATCH_AFNetworking_Reachability 0
+
+// AFNetworking/Security
+#define COCOAPODS_POD_AVAILABLE_AFNetworking_Security
+#define COCOAPODS_VERSION_MAJOR_AFNetworking_Security 2
+#define COCOAPODS_VERSION_MINOR_AFNetworking_Security 5
+#define COCOAPODS_VERSION_PATCH_AFNetworking_Security 0
+
+// AFNetworking/Serialization
+#define COCOAPODS_POD_AVAILABLE_AFNetworking_Serialization
+#define COCOAPODS_VERSION_MAJOR_AFNetworking_Serialization 2
+#define COCOAPODS_VERSION_MINOR_AFNetworking_Serialization 5
+#define COCOAPODS_VERSION_PATCH_AFNetworking_Serialization 0
+
+// AFNetworking/UIKit
+#define COCOAPODS_POD_AVAILABLE_AFNetworking_UIKit
+#define COCOAPODS_VERSION_MAJOR_AFNetworking_UIKit 2
+#define COCOAPODS_VERSION_MINOR_AFNetworking_UIKit 5
+#define COCOAPODS_VERSION_PATCH_AFNetworking_UIKit 0
+
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-resources.sh b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-resources.sh
new file mode 100755
index 000000000..43f08523e
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-resources.sh	
@@ -0,0 +1,93 @@
+#!/bin/sh
+set -e
+
+mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+
+RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
+> "$RESOURCES_TO_COPY"
+
+XCASSET_FILES=()
+
+realpath() {
+  DIRECTORY=$(cd "${1%/*}" && pwd)
+  FILENAME="${1##*/}"
+  echo "$DIRECTORY/$FILENAME"
+}
+
+install_resource()
+{
+  case $1 in
+    *.storyboard)
+      echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc ${PODS_ROOT}/$1 --sdk ${SDKROOT}"
+      ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc" "${PODS_ROOT}/$1" --sdk "${SDKROOT}"
+      ;;
+    *.xib)
+        echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib ${PODS_ROOT}/$1 --sdk ${SDKROOT}"
+      ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib" "${PODS_ROOT}/$1" --sdk "${SDKROOT}"
+      ;;
+    *.framework)
+      echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      echo "rsync -av ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      rsync -av "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      ;;
+    *.xcdatamodel)
+      echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1"`.mom\""
+      xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodel`.mom"
+      ;;
+    *.xcdatamodeld)
+      echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd\""
+      xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd"
+      ;;
+    *.xcmappingmodel)
+      echo "xcrun mapc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm\""
+      xcrun mapc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm"
+      ;;
+    *.xcassets)
+      ABSOLUTE_XCASSET_FILE=$(realpath "${PODS_ROOT}/$1")
+      XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
+      ;;
+    /*)
+      echo "$1"
+      echo "$1" >> "$RESOURCES_TO_COPY"
+      ;;
+    *)
+      echo "${PODS_ROOT}/$1"
+      echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY"
+      ;;
+  esac
+}
+
+rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+if [[ "${ACTION}" == "install" ]]; then
+  rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+fi
+rm -f "$RESOURCES_TO_COPY"
+
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
+then
+  case "${TARGETED_DEVICE_FAMILY}" in
+    1,2)
+      TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
+      ;;
+    1)
+      TARGET_DEVICE_ARGS="--target-device iphone"
+      ;;
+    2)
+      TARGET_DEVICE_ARGS="--target-device ipad"
+      ;;
+    *)
+      TARGET_DEVICE_ARGS="--target-device mac"
+      ;;
+  esac
+
+  # Find all other xcassets (this unfortunately includes those of path pods and other targets).
+  OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
+  while read line; do
+    if [[ $line != "`realpath $PODS_ROOT`*" ]]; then
+      XCASSET_FILES+=("$line")
+    fi
+  done <<<"$OTHER_XCASSETS"
+
+  printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${IPHONEOS_DEPLOYMENT_TARGET}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+fi
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests.debug.xcconfig b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests.debug.xcconfig
new file mode 100644
index 000000000..89450f5b6
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests.debug.xcconfig	
@@ -0,0 +1,6 @@
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking"
+OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking"
+OTHER_LDFLAGS = $(inherited) -ObjC -l"Pods-OHHTTPStubs iOS Tests-AFNetworking" -framework "CoreGraphics" -framework "MobileCoreServices" -framework "Security" -framework "SystemConfiguration"
+OTHER_LIBTOOLFLAGS = $(OTHER_LDFLAGS)
+PODS_ROOT = ${SRCROOT}/Pods
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests.release.xcconfig b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests.release.xcconfig
new file mode 100644
index 000000000..89450f5b6
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests.release.xcconfig	
@@ -0,0 +1,6 @@
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking"
+OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking"
+OTHER_LDFLAGS = $(inherited) -ObjC -l"Pods-OHHTTPStubs iOS Tests-AFNetworking" -framework "CoreGraphics" -framework "MobileCoreServices" -framework "Security" -framework "SystemConfiguration"
+OTHER_LIBTOOLFLAGS = $(OTHER_LDFLAGS)
+PODS_ROOT = ${SRCROOT}/Pods
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs+NSURLSessionConfiguration.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs+NSURLSessionConfiguration.m
new file mode 100644
index 000000000..1184dcad1
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs+NSURLSessionConfiguration.m
@@ -0,0 +1,71 @@
+//
+//  NSURLSessionConfiguration+OHHTTPStubs.m
+//  OHHTTPStubs
+//
+//  Created by Olivier Halligon on 06/10/13.
+//  Copyright (c) 2013 AliSoftware. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+#if defined(__IPHONE_7_0) || defined(__MAC_10_9)
+
+#import <objc/runtime.h>
+#import "OHHTTPStubs.h"
+
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+
+/**
+ *  This helper is used to swizzle NSURLSessionConfiguration constructor methods
+ *  defaultSessionConfiguration and ephemeralSessionConfiguration to insert the private
+ *  OHHTTPStubsProtocol into their protocolClasses array so that OHHTTPStubs is automagically
+ *  supported when you create a new NSURLSession based on one of there configurations.
+ */
+
+typedef NSURLSessionConfiguration*(*SessionConfigConstructor)(id,SEL);
+static SessionConfigConstructor orig_defaultSessionConfiguration;
+static SessionConfigConstructor orig_ephemeralSessionConfiguration;
+
+static SessionConfigConstructor OHHTTPStubsSwizzle(SEL selector, SessionConfigConstructor newImpl)
+{
+    Class cls = NSURLSessionConfiguration.class;
+    Class metaClass = object_getClass(cls);
+    
+    Method origMethod = class_getClassMethod(cls, selector);
+    SessionConfigConstructor origImpl = (SessionConfigConstructor)method_getImplementation(origMethod);
+    if (!class_addMethod(metaClass, selector, (IMP)newImpl, method_getTypeEncoding(origMethod)))
+    {
+        method_setImplementation(origMethod, (IMP)newImpl);
+    }
+    return origImpl;
+}
+
+static NSURLSessionConfiguration* OHHTTPStubs_defaultSessionConfiguration(id self, SEL _cmd)
+{
+    NSURLSessionConfiguration* config = orig_defaultSessionConfiguration(self,_cmd); // call original method
+    [OHHTTPStubs setEnabled:YES forSessionConfiguration:config]; //OHHTTPStubsAddProtocolClassToNSURLSessionConfiguration(config);
+    return config;
+}
+
+static NSURLSessionConfiguration* OHHTTPStubs_ephemeralSessionConfiguration(id self, SEL _cmd)
+{
+    NSURLSessionConfiguration* config = orig_ephemeralSessionConfiguration(self,_cmd); // call original method
+    [OHHTTPStubs setEnabled:YES forSessionConfiguration:config]; //OHHTTPStubsAddProtocolClassToNSURLSessionConfiguration(config);
+    return config;
+}
+
+@interface NSURLSessionConfiguration(OHHTTPStubsSupport) @end
+@implementation NSURLSessionConfiguration(OHHTTPStubsSupport)
++(void)load
+{
+    orig_defaultSessionConfiguration = OHHTTPStubsSwizzle(@selector(defaultSessionConfiguration),
+                                                          OHHTTPStubs_defaultSessionConfiguration);
+    orig_ephemeralSessionConfiguration = OHHTTPStubsSwizzle(@selector(ephemeralSessionConfiguration),
+                                                            OHHTTPStubs_ephemeralSessionConfiguration);
+}
+@end
+
+#endif
+
+
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs.h
new file mode 100644
index 000000000..d4b85dc16
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs.h
@@ -0,0 +1,195 @@
+/***********************************************************************************
+ *
+ * Copyright (c) 2012 Olivier Halligon
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ ***********************************************************************************/
+
+// For SDK 7.1 Compatibility (as this macro was only included starting SDK 8.0)
+#ifndef NS_DESIGNATED_INITIALIZER
+  #if __has_attribute(objc_designated_initializer)
+    #define NS_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer))
+  #else
+    #define NS_DESIGNATED_INITIALIZER
+  #endif
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Imports
+
+#import <Foundation/Foundation.h>
+#import "OHHTTPStubsResponse.h"
+// Because this is supposed to be an umbrella header, we should import every public headers here
+#import "OHHTTPStubsResponse+HTTPMessage.h"
+#import "OHHTTPStubsResponse+JSON.h"
+#import "OHPathHelpers.h"
+
+#ifdef NS_ASSUME_NONNULL_BEGIN
+  NS_ASSUME_NONNULL_BEGIN
+  #define _nullable_ __nullable
+  #define _nonnull_ __nonnull
+#else
+  #define _nullable_
+  #define _nonnull_
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Types
+
+typedef BOOL(^OHHTTPStubsTestBlock)(NSURLRequest* request);
+typedef OHHTTPStubsResponse* _nonnull_ (^OHHTTPStubsResponseBlock)( NSURLRequest* request);
+
+/**
+ *  This opaque type represents an installed stub and is used to uniquely
+ *  identify a stub once it has been created.
+ *
+ *  This type is returned by the `stubRequestsPassingTest:withStubResponse:` method
+ *  so that you can later reference it and use this reference to remove the stub later.
+ *
+ *  This type also let you add arbitrary metadata to a stub to differenciate it
+ *  more easily when debugging.
+ */
+@protocol OHHTTPStubsDescriptor <NSObject>
+/**
+ *  An arbitrary name that you can set and get to describe your stub.
+ *  Use it as your own convenience.
+ *
+ *  This is especially useful if you dump all installed stubs using `allStubs`
+ *  or if you want to log which stubs are being triggered using `onStubActivation:`.
+ */
+@property(nonatomic, strong) NSString* _nullable_ name;
+@end
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Interface
+
+/**
+ * Stubs Manager. Use this class to add and remove stubs and stub your network requests.
+ */
+@interface OHHTTPStubs : NSObject
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Adding & Removing stubs
+
+
+
+/**
+ *  Dedicated method to add a stub
+ *
+ *  @param testBlock Block that should return `YES` if the request passed as parameter
+ *                   should be stubbed with the response block, and `NO` if it should
+ *                   hit the real world (or be managed by another stub).
+ *  @param responseBlock Block that will return the `OHHTTPStubsResponse` (response to
+ *                       use for stubbing) corresponding to the given request
+ *
+ *  @return a stub descriptor that uniquely identifies the stub and can be later used to remove it with `removeStub:`.
+ *
+ *  @note The returned stub descriptor is retained (`__strong` reference) by `OHHTTPStubs`
+ *        until it is removed (with one of the `removeStub:` / `removeAllStubs`
+ *        methods); it is thus recommended to keep it in a `__weak` storage (and not `__strong`)
+ *        in your app code, to let the stub descriptor be destroyed and let the variable go
+ *        back to `nil` automatically when the stub is removed.
+ */
++(id<OHHTTPStubsDescriptor>)stubRequestsPassingTest:(OHHTTPStubsTestBlock)testBlock
+                                   withStubResponse:(OHHTTPStubsResponseBlock)responseBlock;
+
+/**
+ *  Remove a stub from the list of stubs
+ *
+ *  @param stubDesc The stub descriptor that has been returned when adding the stub
+ *                  using `stubRequestsPassingTest:withStubResponse:`
+ *
+ *  @return `YES` if the stub has been successfully removed, `NO` if the parameter was
+ *          not a valid stub identifier
+ */
++(BOOL)removeStub:(id<OHHTTPStubsDescriptor>)stubDesc;
+
+/**
+ *  Remove all the stubs from the stubs list.
+ */
++(void)removeAllStubs;
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Disabling & Re-Enabling stubs
+
+/**
+ *  Enable or disable the stubs for the shared session or for `NSURLConnection`
+ *
+ *  @param enabled If `YES`, enables the stubs. If `NO`, disable all the
+ *                 stubs and let all the requests hit the real world.
+ *
+ *  @note OHHTTPStubs are enabled by default, so there is no need to call
+ *        this method with `YES` for stubs to work, except if you explicitely
+ *        disabled the stubs before.
+ *
+ *  @note This only affects requests that are further made using `NSURLConnection`
+ *        or using `[NSURLSession sharedSession]`. This does not affect requests
+ *        sent on an `NSURLSession` created using an `NSURLSessionConfiguration`.
+ */
++(void)setEnabled:(BOOL)enabled;
+
+#if defined(__IPHONE_7_0) || defined(__MAC_10_9)
+/**
+ *  Enable or disable the stubs on a given `NSURLSessionConfiguration`.
+ *
+ *  @param enabled If `YES`, enables the stubs for this `NSURLSessionConfiguration`.
+ *                 If `NO`, disable the stubs and let all the requests hit the real world
+ *  @param sessionConfig The NSURLSessionConfiguration on which to enabled/disable the stubs
+ *
+ *  @note OHHTTPStubs are enabled by default on newly created `defaultSessionConfiguration`
+ *        and `ephemeralSessionConfiguration`, so there is no need to call this method with
+ *        `YES` for stubs to work. You generally only use this if you want to disable
+ *        `OHTTPStubs` per `NSURLSession` by calling it before building the `NSURLSession`
+ *        with the `NSURLSessionConfiguration`.
+ *
+ *  @note Important: As usual according to the way `NSURLSessionConfiguration` works, you 
+ *        MUST set this property BEFORE creating the `NSURLSession`. Once the `NSURLSession`
+ *        object is created, they use a deep copy of the `NSURLSessionConfiguration` object
+ *        used to create them, so changing the configuration later does not affect already
+ *        created sessions.
+ */
++ (void)setEnabled:(BOOL)enabled forSessionConfiguration:(NSURLSessionConfiguration *)sessionConfig;
+#endif
+
+#pragma mark - Debug Methods
+
+/**
+ *  List all the installed stubs
+ *
+ *  @return An array of `id<OHHTTPStubsDescriptor>` objects currently installed. Useful for debug.
+ */
++(NSArray*)allStubs;
+
+/**
+ *  Setup a block to be called each time a stub is triggered.
+ *
+ *  Useful if you want to log all your requests being stubbed for example and see which stub
+ *  was used to respond to each request.
+ *
+ *  @param block The block to call each time a request is being stubbed by OHHTTPStubs.
+ *               Set it to `nil` to do nothing. Defaults is `nil`.
+ */
++(void)onStubActivation:( void(^)(NSURLRequest* request, id<OHHTTPStubsDescriptor> stub) )block;
+
+@end
+
+#ifdef NS_ASSUME_NONNULL_END
+  NS_ASSUME_NONNULL_END
+#endif
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs.m
new file mode 100644
index 000000000..4d36ae693
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs.m
@@ -0,0 +1,530 @@
+/***********************************************************************************
+ *
+ * Copyright (c) 2012 Olivier Halligon
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ ***********************************************************************************/
+
+#if ! __has_feature(objc_arc)
+#error This file is expected to be compiled with ARC turned ON
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Imports
+
+#import "OHHTTPStubs.h"
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Types & Constants
+
+@interface OHHTTPStubsProtocol : NSURLProtocol @end
+
+static NSTimeInterval const kSlotTime = 0.25; // Must be >0. We will send a chunk of the data from the stream each 'slotTime' seconds
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Private Interfaces
+
+@interface OHHTTPStubs()
++ (instancetype)sharedInstance;
+@property(atomic, copy) NSMutableArray* stubDescriptors;
+@property(atomic, copy) void (^onStubActivationBlock)(NSURLRequest*, id<OHHTTPStubsDescriptor>);
+@end
+
+@interface OHHTTPStubsDescriptor : NSObject <OHHTTPStubsDescriptor>
+@property(atomic, copy) OHHTTPStubsTestBlock testBlock;
+@property(atomic, copy) OHHTTPStubsResponseBlock responseBlock;
+@end
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - OHHTTPStubsDescriptor Implementation
+
+@implementation OHHTTPStubsDescriptor
+
+@synthesize name = _name;
+
++(instancetype)stubDescriptorWithTestBlock:(OHHTTPStubsTestBlock)testBlock
+                             responseBlock:(OHHTTPStubsResponseBlock)responseBlock
+{
+    OHHTTPStubsDescriptor* stub = [OHHTTPStubsDescriptor new];
+    stub.testBlock = testBlock;
+    stub.responseBlock = responseBlock;
+    return stub;
+}
+
+-(NSString*)description
+{
+    return [NSString stringWithFormat:@"<%@ %p : %@>", self.class, self, self.name];
+}
+
+@end
+
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - OHHTTPStubs Implementation
+
+@implementation OHHTTPStubs
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Singleton methods
+
++ (instancetype)sharedInstance
+{
+    static OHHTTPStubs *sharedInstance = nil;
+    
+    static dispatch_once_t predicate;
+    dispatch_once(&predicate, ^{
+        sharedInstance = [[self alloc] init];
+    });
+    
+    return sharedInstance;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Setup & Teardown
+
++ (void)initialize
+{
+    if (self == [OHHTTPStubs class])
+    {
+        [self setEnabled:YES];
+    }
+}
+- (id)init
+{
+    self = [super init];
+    if (self)
+    {
+        _stubDescriptors = [NSMutableArray array];
+    }
+    return self;
+}
+
+- (void)dealloc
+{
+    [self.class setEnabled:NO];
+}
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Public class methods
+
+#pragma mark > Adding & Removing stubs
+
++(id<OHHTTPStubsDescriptor>)stubRequestsPassingTest:(OHHTTPStubsTestBlock)testBlock
+                                   withStubResponse:(OHHTTPStubsResponseBlock)responseBlock
+{
+    OHHTTPStubsDescriptor* stub = [OHHTTPStubsDescriptor stubDescriptorWithTestBlock:testBlock
+                                                                       responseBlock:responseBlock];
+    [OHHTTPStubs.sharedInstance addStub:stub];
+    return stub;
+}
+
++(BOOL)removeStub:(id<OHHTTPStubsDescriptor>)stubDesc
+{
+    return [OHHTTPStubs.sharedInstance removeStub:stubDesc];
+}
+
++(void)removeAllStubs
+{
+    [OHHTTPStubs.sharedInstance removeAllStubs];
+}
+
+#pragma mark > Disabling & Re-Enabling stubs
+
++(void)setEnabled:(BOOL)enable
+{
+    static BOOL currentEnabledState = NO;
+    if (enable && !currentEnabledState)
+    {
+        [NSURLProtocol registerClass:OHHTTPStubsProtocol.class];
+    }
+    else if (!enable && currentEnabledState)
+    {
+        [NSURLProtocol unregisterClass:OHHTTPStubsProtocol.class];
+    }
+    currentEnabledState = enable;
+}
+
+#if defined(__IPHONE_7_0) || defined(__MAC_10_9)
++ (void)setEnabled:(BOOL)enable forSessionConfiguration:(NSURLSessionConfiguration*)sessionConfig
+{
+    // Runtime check to make sure the API is available on this version
+    if (   [sessionConfig respondsToSelector:@selector(protocolClasses)]
+        && [sessionConfig respondsToSelector:@selector(setProtocolClasses:)])
+    {
+        NSMutableArray * urlProtocolClasses = [NSMutableArray arrayWithArray:sessionConfig.protocolClasses];
+        Class protoCls = OHHTTPStubsProtocol.class;
+        if (enable && ![urlProtocolClasses containsObject:protoCls])
+        {
+            [urlProtocolClasses insertObject:protoCls atIndex:0];
+        }
+        else if (!enable && [urlProtocolClasses containsObject:protoCls])
+        {
+            [urlProtocolClasses removeObject:protoCls];
+        }
+        sessionConfig.protocolClasses = urlProtocolClasses;
+    }
+    else
+    {
+        NSLog(@"[OHHTTPStubs] %@ is only available when running on iOS7+/OSX9+. "
+              @"Use conditions like 'if ([NSURLSessionConfiguration class])' to only call "
+              @"this method if the user is running iOS7+/OSX9+.", NSStringFromSelector(_cmd));
+    }
+}
+#endif
+
+#pragma mark > Debug Methods
+
++(NSArray*)allStubs
+{
+    return [OHHTTPStubs.sharedInstance stubDescriptors];
+}
+
++(void)onStubActivation:( void(^)(NSURLRequest* request, id<OHHTTPStubsDescriptor> stub) )block
+{
+    [OHHTTPStubs.sharedInstance setOnStubActivationBlock:block];
+}
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Private instance methods
+
+-(void)addStub:(OHHTTPStubsDescriptor*)stubDesc
+{
+    @synchronized(_stubDescriptors)
+    {
+        [_stubDescriptors addObject:stubDesc];
+    }
+}
+
+-(BOOL)removeStub:(id<OHHTTPStubsDescriptor>)stubDesc
+{
+    BOOL handlerFound = NO;
+    @synchronized(_stubDescriptors)
+    {
+        handlerFound = [_stubDescriptors containsObject:stubDesc];
+        [_stubDescriptors removeObject:stubDesc];
+    }
+    return handlerFound;
+}
+
+-(void)removeAllStubs
+{
+    @synchronized(_stubDescriptors)
+    {
+        [_stubDescriptors removeAllObjects];
+    }
+}
+
+- (OHHTTPStubsDescriptor*)firstStubPassingTestForRequest:(NSURLRequest*)request
+{
+    OHHTTPStubsDescriptor* foundStub = nil;
+    @synchronized(_stubDescriptors)
+    {
+        for(OHHTTPStubsDescriptor* stub in _stubDescriptors.reverseObjectEnumerator)
+        {
+            if (stub.testBlock(request))
+            {
+                foundStub = stub;
+                break;
+            }
+        }
+    }
+    return foundStub;
+}
+
+@end
+
+
+
+
+
+
+
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Private Protocol Class
+
+@interface OHHTTPStubsProtocol()
+@property(assign) BOOL stopped;
+@property(strong) OHHTTPStubsDescriptor* stub;
+@property(assign) CFRunLoopRef clientRunLoop;
+- (void)executeOnClientRunLoopAfterDelay:(NSTimeInterval)delayInSeconds block:(dispatch_block_t)block;
+@end
+
+@implementation OHHTTPStubsProtocol
+
++ (BOOL)canInitWithRequest:(NSURLRequest *)request
+{
+    return ([OHHTTPStubs.sharedInstance firstStubPassingTestForRequest:request] != nil);
+}
+
+- (id)initWithRequest:(NSURLRequest *)request cachedResponse:(NSCachedURLResponse *)response client:(id<NSURLProtocolClient>)client
+{
+    // Make super sure that we never use a cached response.
+    OHHTTPStubsProtocol* proto = [super initWithRequest:request cachedResponse:nil client:client];
+    proto.stub = [OHHTTPStubs.sharedInstance firstStubPassingTestForRequest:request];
+    return proto;
+}
+
++ (NSURLRequest *)canonicalRequestForRequest:(NSURLRequest *)request
+{
+	return request;
+}
+
+- (NSCachedURLResponse *)cachedResponse
+{
+	return nil;
+}
+
+- (void)startLoading
+{
+    self.clientRunLoop = CFRunLoopGetCurrent();
+    NSURLRequest* request = self.request;
+    id<NSURLProtocolClient> client = self.client;
+    
+    if (!self.stub)
+    {
+        NSDictionary* userInfo = [NSDictionary dictionaryWithObjectsAndKeys:
+                                  @"It seems like the stub has been removed BEFORE the response had time to be sent.",
+                                  NSLocalizedFailureReasonErrorKey,
+                                  @"For more info, see https://github.com/AliSoftware/OHHTTPStubs/wiki/OHHTTPStubs-and-asynchronous-tests",
+                                  NSLocalizedRecoverySuggestionErrorKey,
+                                  request.URL, // Stop right here if request.URL is nil
+                                  NSURLErrorFailingURLErrorKey,
+                                  nil];
+        NSError* error = [NSError errorWithDomain:@"OHHTTPStubs" code:500 userInfo:userInfo];
+        [client URLProtocol:self didFailWithError:error];
+        return;
+    }
+    
+    OHHTTPStubsResponse* responseStub = self.stub.responseBlock(request);
+    
+    if (OHHTTPStubs.sharedInstance.onStubActivationBlock)
+    {
+        OHHTTPStubs.sharedInstance.onStubActivationBlock(request, self.stub);
+    }
+    
+    if (responseStub.error == nil)
+    {
+        NSHTTPURLResponse* urlResponse = [[NSHTTPURLResponse alloc] initWithURL:request.URL
+                                                                     statusCode:responseStub.statusCode
+                                                                    HTTPVersion:@"HTTP/1.1"
+                                                                   headerFields:responseStub.httpHeaders];
+        
+        // Cookies handling
+        if (request.HTTPShouldHandleCookies && request.URL)
+        {
+            NSArray* cookies = [NSHTTPCookie cookiesWithResponseHeaderFields:responseStub.httpHeaders forURL:request.URL];
+            if (cookies)
+            {
+                [NSHTTPCookieStorage.sharedHTTPCookieStorage setCookies:cookies forURL:request.URL mainDocumentURL:request.mainDocumentURL];
+            }
+        }
+        
+        
+        NSString* redirectLocation = (responseStub.httpHeaders)[@"Location"];
+        NSURL* redirectLocationURL;
+        if (redirectLocation)
+        {
+            redirectLocationURL = [NSURL URLWithString:redirectLocation];
+        }
+        else
+        {
+            redirectLocationURL = nil;
+        }
+        if (((responseStub.statusCode > 300) && (responseStub.statusCode < 400)) && redirectLocationURL)
+        {
+            NSURLRequest* redirectRequest = [NSURLRequest requestWithURL:redirectLocationURL];
+            [self executeOnClientRunLoopAfterDelay:responseStub.requestTime block:^{
+                if (!self.stopped)
+                {
+                    [client URLProtocol:self wasRedirectedToRequest:redirectRequest redirectResponse:urlResponse];
+                }
+            }];
+        }
+        else
+        {
+            [self executeOnClientRunLoopAfterDelay:responseStub.requestTime block:^{
+                if (!self.stopped)
+                {
+                    [client URLProtocol:self didReceiveResponse:urlResponse cacheStoragePolicy:NSURLCacheStorageNotAllowed];
+                    if(responseStub.inputStream.streamStatus == NSStreamStatusNotOpen)
+                    {
+                        [responseStub.inputStream open];
+                    }
+                    [self streamDataForClient:client
+                             withStubResponse:responseStub
+                                   completion:^(NSError * error)
+                     {
+                         [responseStub.inputStream close];
+                         if (error==nil)
+                         {
+                             [client URLProtocolDidFinishLoading:self];
+                         }
+                         else
+                         {
+                             [client URLProtocol:self didFailWithError:responseStub.error];
+                         }
+                     }];
+                }
+            }];
+        }
+    } else {
+        // Send the canned error
+        [self executeOnClientRunLoopAfterDelay:responseStub.responseTime block:^{
+            if (!self.stopped)
+            {
+                [client URLProtocol:self didFailWithError:responseStub.error];
+            }
+        }];
+    }
+}
+
+- (void)stopLoading
+{
+    self.stopped = YES;
+}
+
+typedef struct {
+    NSTimeInterval slotTime;
+    double chunkSizePerSlot;
+    double cumulativeChunkSize;
+} OHHTTPStubsStreamTimingInfo;
+
+- (void)streamDataForClient:(id<NSURLProtocolClient>)client
+           withStubResponse:(OHHTTPStubsResponse*)stubResponse
+                 completion:(void(^)(NSError * error))completion
+{
+    if ((stubResponse.dataSize>0) && stubResponse.inputStream.hasBytesAvailable && (!self.stopped))
+    {
+        // Compute timing data once and for all for this stub
+        
+        OHHTTPStubsStreamTimingInfo timingInfo = {
+            .slotTime = kSlotTime, // Must be >0. We will send a chunk of data from the stream each 'slotTime' seconds
+            .cumulativeChunkSize = 0
+        };
+        
+        if(stubResponse.responseTime < 0)
+        {
+            // Bytes send each 'slotTime' seconds = Speed in KB/s * 1000 * slotTime in seconds
+            timingInfo.chunkSizePerSlot = (fabs(stubResponse.responseTime) * 1000) * timingInfo.slotTime;
+        }
+        else if (stubResponse.responseTime < kSlotTime) // includes case when responseTime == 0
+        {
+            // We want to send the whole data quicker than the slotTime, so send it all in one chunk.
+            timingInfo.chunkSizePerSlot = stubResponse.dataSize;
+            timingInfo.slotTime = stubResponse.responseTime;
+        }
+        else
+        {
+            // Bytes send each 'slotTime' seconds = (Whole size in bytes / response time) * slotTime = speed in bps * slotTime in seconds
+            timingInfo.chunkSizePerSlot = ((stubResponse.dataSize/stubResponse.responseTime) * timingInfo.slotTime);
+        }
+        
+        [self streamDataForClient:client
+                       fromStream:stubResponse.inputStream
+                       timingInfo:timingInfo
+                       completion:completion];
+    }
+    else
+    {
+        if (completion)
+        {
+            completion(nil);
+        }
+    }
+}
+
+- (void) streamDataForClient:(id<NSURLProtocolClient>)client
+                  fromStream:(NSInputStream*)inputStream
+                  timingInfo:(OHHTTPStubsStreamTimingInfo)timingInfo
+                  completion:(void(^)(NSError * error))completion
+{
+    NSParameterAssert(timingInfo.chunkSizePerSlot > 0);
+    
+    if (inputStream.hasBytesAvailable && (!self.stopped))
+    {
+        // This is needed in case we computed a non-integer chunkSizePerSlot, to avoid cumulative errors
+        double cumulativeChunkSizeAfterRead = timingInfo.cumulativeChunkSize + timingInfo.chunkSizePerSlot;
+        NSUInteger chunkSizeToRead = floor(cumulativeChunkSizeAfterRead) - floor(timingInfo.cumulativeChunkSize);
+        timingInfo.cumulativeChunkSize = cumulativeChunkSizeAfterRead;
+        
+        if (chunkSizeToRead == 0)
+        {
+            // Nothing to read at this pass, but probably later
+            [self executeOnClientRunLoopAfterDelay:timingInfo.slotTime block:^{
+                [self streamDataForClient:client fromStream:inputStream
+                               timingInfo:timingInfo completion:completion];
+            }];
+        } else {
+            uint8_t* buffer = (uint8_t*)malloc(sizeof(uint8_t)*chunkSizeToRead);
+            NSInteger bytesRead = [inputStream read:buffer maxLength:chunkSizeToRead];
+            if (bytesRead > 0)
+            {
+                NSData * data = [NSData dataWithBytes:buffer length:bytesRead];
+                // Wait for 'slotTime' seconds before sending the chunk.
+                // If bytesRead < chunkSizePerSlot (because we are near the EOF), adjust slotTime proportionally to the bytes remaining
+                [self executeOnClientRunLoopAfterDelay:((double)bytesRead / (double)chunkSizeToRead) * timingInfo.slotTime block:^{
+                    [client URLProtocol:self didLoadData:data];
+                    [self streamDataForClient:client fromStream:inputStream
+                                   timingInfo:timingInfo completion:completion];
+                }];
+            }
+            else
+            {
+                if (completion)
+                {
+                    // Note: We may also arrive here with no error if we were just at the end of the stream (EOF)
+                    // In that case, hasBytesAvailable did return YES (because at the limit of OEF) but nothing were read (because EOF)
+                    // But then in that case inputStream.streamError will be nil so that's cool, we won't return an error anyway
+                    completion(inputStream.streamError);
+                }
+            }
+            free(buffer);
+        }
+    }
+    else
+    {
+        if (completion)
+        {
+            completion(nil);
+        }
+    }
+}
+
+/////////////////////////////////////////////
+// Delayed execution utility methods
+/////////////////////////////////////////////
+
+- (void)executeOnClientRunLoopAfterDelay:(NSTimeInterval)delayInSeconds block:(dispatch_block_t)block
+{
+    dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
+    dispatch_after(popTime, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        CFRunLoopPerformBlock(self.clientRunLoop, kCFRunLoopDefaultMode, block);
+        CFRunLoopWakeUp(self.clientRunLoop);
+    });
+}
+
+@end
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+HTTPMessage.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+HTTPMessage.h
new file mode 100644
index 000000000..0ac0f6e12
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+HTTPMessage.h
@@ -0,0 +1,62 @@
+//
+//  OHHTTPStubsResponse+HTTPMessage.h
+//  OHHTTPStubs
+//
+//  Created by Olivier Halligon on 01/09/13.
+//  Copyright (c) 2013 AliSoftware. All rights reserved.
+//
+
+#import "OHHTTPStubsResponse.h"
+
+#ifdef NS_ASSUME_NONNULL_BEGIN
+  NS_ASSUME_NONNULL_BEGIN
+  #define _nullable_ __nullable
+#else
+  #define _nullable_
+#endif
+
+
+/**
+ *  Adds support for building stubs from "HTTP Messages" conforming to
+ *  the format output by `curl -is`
+ */
+@interface OHHTTPStubsResponse (HTTPMessage)
+
+/*! @name Building a response from HTTP Message data */
+
+// TODO: Try to implement it using NSInputStream someday?
+
+/**
+ * Builds a response given a message data as returned by `curl -is [url]`, that is containing both the headers and the body.
+ *
+ * This method will split the headers and the body and build a OHHTTPStubsReponse accordingly
+ *
+ * @param responseData The NSData containing the whole HTTP response, including the headers and the body
+ *
+ * @return An `OHHTTPStubsResponse` describing the corresponding response to return by the stub
+ */
++(instancetype)responseWithHTTPMessageData:(NSData*)responseData;
+
+/**
+ * Builds a response given the name of a `"*.response"` file containing both the headers and the body.
+ *
+ * The response file is expected to be in the specified bundle (or the application bundle if nil).
+ * This method will split the headers and the body and build a OHHTTPStubsReponse accordingly
+ *
+ * @param responseName The name of the `"*.response"` file (without extension) containing the whole
+ *                     HTTP response (including the headers and the body)
+ * @param bundleOrNil  The bundle in which the `"*.response"` file is located. If `nil`, the
+ *                     `[NSBundle bundleForClass:self.class]` will be used.
+ *
+ * @return An `OHHTTPStubsResponse` describing the corresponding response to return by the stub
+ */
+
++(instancetype)responseNamed:(NSString*)responseName
+                    inBundle:(NSBundle* _nullable_)bundleOrNil;
+
+
+@end
+
+#ifdef NS_ASSUME_NONNULL_END
+  NS_ASSUME_NONNULL_END
+#endif
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+HTTPMessage.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+HTTPMessage.m
new file mode 100644
index 000000000..03d0e7a6d
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+HTTPMessage.m
@@ -0,0 +1,54 @@
+//
+//  OHHTTPStubsResponse+HTTPMessage.m
+//  OHHTTPStubs
+//
+//  Created by Olivier Halligon on 01/09/13.
+//  Copyright (c) 2013 AliSoftware. All rights reserved.
+//
+
+#import "OHHTTPStubsResponse+HTTPMessage.h"
+
+@implementation OHHTTPStubsResponse (HTTPMessage)
+
+#pragma mark Building response from HTTP Message Data (dump from "curl -is")
+
++(instancetype)responseWithHTTPMessageData:(NSData*)responseData;
+{
+    NSData *data = [NSData data];
+    NSInteger statusCode = 200;
+    NSDictionary *headers = @{};
+    
+    CFHTTPMessageRef httpMessage = CFHTTPMessageCreateEmpty(kCFAllocatorDefault, FALSE);
+    if (httpMessage)
+    {
+        CFHTTPMessageAppendBytes(httpMessage, responseData.bytes, responseData.length);
+        
+        data = responseData; // By default
+        
+        if (CFHTTPMessageIsHeaderComplete(httpMessage))
+        {
+            statusCode = (NSInteger)CFHTTPMessageGetResponseStatusCode(httpMessage);
+            headers = (__bridge_transfer NSDictionary *)CFHTTPMessageCopyAllHeaderFields(httpMessage);
+            data = (__bridge_transfer NSData *)CFHTTPMessageCopyBody(httpMessage);
+        }
+        CFRelease(httpMessage);
+    }
+    
+    return [self responseWithData:data
+                       statusCode:(int)statusCode
+                          headers:headers];
+}
+
++(instancetype)responseNamed:(NSString*)responseName
+                    inBundle:(NSBundle*)responsesBundle
+{
+    NSURL *responseURL = [responsesBundle?:[NSBundle bundleForClass:self.class] URLForResource:responseName
+                                                                                   withExtension:@"response"];
+    
+    NSData *responseData = [NSData dataWithContentsOfURL:responseURL];
+    NSAssert(responseData, @"Could not find HTTP response named '%@' in bundle '%@'", responseName, responsesBundle);
+    
+    return [self responseWithHTTPMessageData:responseData];
+}
+
+@end
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+JSON.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+JSON.h
new file mode 100644
index 000000000..fc8719df0
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+JSON.h
@@ -0,0 +1,47 @@
+//
+//  OHHTTPStubsResponse+JSON.h
+//  OHHTTPStubs
+//
+//  Created by Olivier Halligon on 01/09/13.
+//  Copyright (c) 2013 AliSoftware. All rights reserved.
+//
+
+#import "OHHTTPStubsResponse.h"
+
+#ifdef NS_ASSUME_NONNULL_BEGIN
+  NS_ASSUME_NONNULL_BEGIN
+  #define _nullable_ __nullable
+#else
+  #define _nullable_
+#endif
+
+
+/**
+ *  Adds convenience methods to manipulate JSON objects directly.
+ *  Pass in an `NSDictionary` or `NSArray` to generate a corresponding JSON output.
+ */
+@interface OHHTTPStubsResponse (JSON)
+
+/**
+ *  Builds a response given a JSON object for the response body, status code, and headers.
+ *
+ *  @param jsonObject  Object representing the response body.
+ *                     Typically a `NSDictionary`; may be any object accepted by `+[NSJSONSerialization dataWithJSONObject:options:error:]`
+ *  @param statusCode  The HTTP Status Code to use in the response
+ *  @param httpHeaders The HTTP Headers to return in the response
+ *                     If a "Content-Type" header is not included, "Content-Type: application/json" will be added.
+ *
+ *  @return An `OHHTTPStubsResponse` describing the corresponding response to return by the stub
+ *
+ *  @note This method typically calls `responseWithData:statusCode:headers:`, passing the serialized JSON
+ *        object as the data parameter and adding the Content-Type header if necessary.
+ */
++ (instancetype)responseWithJSONObject:(id)jsonObject
+                            statusCode:(int)statusCode
+                               headers:(NSDictionary * _nullable_)httpHeaders;
+
+@end
+
+#ifdef NS_ASSUME_NONNULL_END
+  NS_ASSUME_NONNULL_END
+#endif
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+JSON.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+JSON.m
new file mode 100644
index 000000000..aebcb9908
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+JSON.m
@@ -0,0 +1,31 @@
+//
+//  OHHTTPStubsResponse+JSON.m
+//  OHHTTPStubs
+//
+//  Created by Olivier Halligon on 01/09/13.
+//  Copyright (c) 2013 AliSoftware. All rights reserved.
+//
+
+#import "OHHTTPStubsResponse+JSON.h"
+
+@implementation OHHTTPStubsResponse (JSON)
+
+/*! @name Building a response from JSON objects */
+
++ (instancetype)responseWithJSONObject:(id)jsonObject
+                            statusCode:(int)statusCode
+                               headers:(NSDictionary *)httpHeaders
+{
+    if (!httpHeaders[@"Content-Type"])
+    {
+        NSMutableDictionary* mutableHeaders = [NSMutableDictionary dictionaryWithDictionary:httpHeaders];
+        mutableHeaders[@"Content-Type"] = @"application/json";
+        httpHeaders = [NSDictionary dictionaryWithDictionary:mutableHeaders]; // make immutable again
+    }
+    
+    return [self responseWithData:[NSJSONSerialization dataWithJSONObject:jsonObject options:0 error:nil]
+                       statusCode:statusCode
+                          headers:httpHeaders];
+}
+
+@end
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse.h
new file mode 100644
index 000000000..a80abd133
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse.h
@@ -0,0 +1,271 @@
+/***********************************************************************************
+ *
+ * Copyright (c) 2012 Olivier Halligon
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ ***********************************************************************************/
+
+// For SDK 7.1 Compatibility (as this macro was only included starting SDK 8.0)
+#ifndef NS_DESIGNATED_INITIALIZER
+  #if __has_attribute(objc_designated_initializer)
+    #define NS_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer))
+  #else
+    #define NS_DESIGNATED_INITIALIZER
+  #endif
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Imports
+
+#import <Foundation/Foundation.h>
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Defines & Constants
+
+// Standard download speeds.
+extern const double
+OHHTTPStubsDownloadSpeedGPRS,
+OHHTTPStubsDownloadSpeedEDGE,
+OHHTTPStubsDownloadSpeed3G,
+OHHTTPStubsDownloadSpeed3GPlus,
+OHHTTPStubsDownloadSpeedWifi;
+
+#ifdef NS_ASSUME_NONNULL_BEGIN
+  NS_ASSUME_NONNULL_BEGIN
+  #define _nullable_ __nullable
+#else
+  #define _nullable_
+#endif
+
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Interface
+
+/**
+ *  Stubs Response. This describes a stubbed response to be returned by the URL Loading System,
+ *  including its HTTP headers, body, statusCode and response time.
+ */
+@interface OHHTTPStubsResponse : NSObject
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Properties
+
+/**
+ *  The headers to use for the fake response
+ */
+@property(nonatomic, strong) NSDictionary* _nullable_ httpHeaders;
+/**
+ *  The HTTP status code to use for the fake response
+ */
+@property(nonatomic, assign) int statusCode;
+/**
+ *  The inputStream used when sending the response.
+ *  @note You generally don't manipulate this directly.
+ */
+@property(nonatomic, strong) NSInputStream* _nullable_ inputStream;
+/**
+ *  The size of the fake response body, in bytes.
+ */
+@property(nonatomic, assign) unsigned long long dataSize;
+/**
+ *  The duration to wait before faking receiving the response headers.
+ *
+ *  Defaults to 0.0.
+ */
+@property(nonatomic, assign) NSTimeInterval requestTime;
+/**
+ *  The duration to use to send the fake response body.
+ *
+ * @note if responseTime<0, it is interpreted as a download speed in KBps ( -200 => 200KB/s )
+ */
+@property(nonatomic, assign) NSTimeInterval responseTime;
+/**
+ *  The fake error to generate to simulate a network error.
+ *
+ *  If `error` is non-`nil`, the request will result in a failure and no response will be sent.
+ */
+@property(nonatomic, strong) NSError* _nullable_ error;
+
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Commodity Constructors
+/*! @name Commodity */
+
+/* -------------------------------------------------------------------------- */
+#pragma mark > Building response from NSData
+
+/**
+ *  Builds a response given raw data.
+ *
+ *  @note Internally calls `-initWithInputStream:dataSize:statusCode:headers:` with and inputStream built from the NSData.
+ *
+ *  @param data The raw data to return in the response
+ *  @param statusCode The HTTP Status Code to use in the response
+ *  @param httpHeaders The HTTP Headers to return in the response
+ *  @return An `OHHTTPStubsResponse` describing the corresponding response to return by the stub
+ */
++(instancetype)responseWithData:(NSData*)data
+                     statusCode:(int)statusCode
+                        headers:(NSDictionary* _nullable_)httpHeaders;
+
+
+/* -------------------------------------------------------------------------- */
+#pragma mark > Building response from a file
+
+/**
+ *  Builds a response given a file path, the status code and headers.
+ *
+ *  @param filePath The file path that contains the response body to return.
+ *  @param statusCode The HTTP Status Code to use in the response
+ *  @param httpHeaders The HTTP Headers to return in the response
+ *
+ *  @return An `OHHTTPStubsResponse` describing the corresponding response to return by the stub
+ *
+ *  @note It is encouraged to use the OHPathHelpers functions & macros to build
+ *        the filePath parameter easily
+ */
++(instancetype)responseWithFileAtPath:(NSString *)filePath
+                           statusCode:(int)statusCode
+                              headers:(NSDictionary* _nullable_)httpHeaders;
+
+/* -------------------------------------------------------------------------- */
+#pragma mark > Building an error response
+
+/**
+ *  Builds a response that corresponds to the given error
+ *
+ *  @param error The error to use in the stubbed response.
+ *
+ *  @return An `OHHTTPStubsResponse` describing the corresponding response to return by the stub
+ *
+ *  @note For example you could use an error like `[NSError errorWithDomain:NSURLErrorDomain code:kCFURLErrorNotConnectedToInternet userInfo:nil]`
+ */
++(instancetype)responseWithError:(NSError*)error;
+
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Commotidy Setters
+
+/**
+ *  Set the `responseTime` of the `OHHTTPStubsResponse` and return `self`. Useful for chaining method calls.
+ *
+ *  _Usage example:_
+ *  <pre>return [[OHHTTPStubsReponse responseWithData:data statusCode:200 headers:nil] responseTime:5.0];</pre>
+ *
+ *  @param responseTime If positive, the amount of time used to send the entire response.
+ *                     If negative, the rate in KB/s at which to send the response data.
+ *                     Useful to simulate slow networks for example. You may use the
+ *                     _OHHTTPStubsDownloadSpeed…_ constants here.
+ *
+ *  @return `self` (= the same `OHHTTPStubsResponse` that was the target of this method).
+ *          Returning `self` is useful for chaining method calls.
+ */
+-(instancetype)responseTime:(NSTimeInterval)responseTime;
+
+/**
+ *  Set both the `requestTime` and the `responseTime` of the `OHHTTPStubsResponse` at once.
+ *  Useful for chaining method calls.
+ *
+ *  _Usage example:_
+ *  <pre>return [[OHHTTPStubsReponse responseWithData:data statusCode:200 headers:nil]
+ *            requestTime:1.0 responseTime:5.0];</pre>
+ *
+ *  @param requestTime The time to wait before the response begins to send. This value must be greater than or equal to zero.
+ *  @param responseTime If positive, the amount of time used to send the entire response.
+ *                      If negative, the rate in KB/s at which to send the response data.
+ *                      Useful to simulate slow networks for example. You may use the
+ *                      _OHHTTPStubsDownloadSpeed…_ constants here.
+ *
+ *  @return `self` (= the same `OHHTTPStubsResponse` that was the target of this method). Useful for chaining method calls.
+ */
+-(instancetype)requestTime:(NSTimeInterval)requestTime responseTime:(NSTimeInterval)responseTime;
+
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Initializers
+/*! @name Initializers */
+
+/**
+ *  Designed initializer. Initialize a response with the given input stream, dataSize, 
+ *  statusCode and headers.
+ *
+ *  @param inputStream The input stream that will provide the data to return in the response
+ *  @param dataSize The size of the data in the stream.
+ *  @param statusCode The HTTP Status Code to use in the response
+ *  @param httpHeaders The HTTP Headers to return in the response
+ *
+ *  @return An `OHHTTPStubsResponse` describing the corresponding response to return by the stub
+ *
+ *  @note You will probably never need to call this method yourself. Prefer the other initializers (that will call this method eventually)
+ */
+-(instancetype)initWithInputStream:(NSInputStream*)inputStream
+                          dataSize:(unsigned long long)dataSize
+                        statusCode:(int)statusCode
+                           headers:(NSDictionary* _nullable_)httpHeaders NS_DESIGNATED_INITIALIZER;
+
+
+/**
+ *  Initialize a response with a given file path, statusCode and headers.
+ *
+ *  @param filePath The file path of the data to return in the response
+ *  @param statusCode The HTTP Status Code to use in the response
+ *  @param httpHeaders The HTTP Headers to return in the response
+ *
+ *  @return An `OHHTTPStubsResponse` describing the corresponding response to return by the stub
+ *
+ *  @note This method simply builds the NSInputStream, compute the file size, and then call `-initWithInputStream:dataSize:statusCode:headers:`
+ */
+-(instancetype)initWithFileAtPath:(NSString*)filePath
+                       statusCode:(int)statusCode
+                          headers:(NSDictionary* _nullable_)httpHeaders;
+
+
+/**
+ *  Initialize a response with the given data, statusCode and headers.
+ *
+ *  @param data The raw data to return in the response
+ *  @param statusCode The HTTP Status Code to use in the response
+ *  @param httpHeaders The HTTP Headers to return in the response
+ *
+ *  @return An `OHHTTPStubsResponse` describing the corresponding response to return by the stub
+ */
+-(instancetype)initWithData:(NSData*)data
+                 statusCode:(int)statusCode
+                    headers:(NSDictionary* _nullable_)httpHeaders;
+
+
+/**
+ *  Designed initializer. Initialize a response with the given error.
+ *
+ *  @param error The error to use in the stubbed response.
+ *
+ *  @return An `OHHTTPStubsResponse` describing the corresponding response to return by the stub
+ *
+ *  @note For example you could use an error like `[NSError errorWithDomain:NSURLErrorDomain code:kCFURLErrorNotConnectedToInternet userInfo:nil]`
+ */
+-(instancetype)initWithError:(NSError*)error NS_DESIGNATED_INITIALIZER;
+
+@end
+
+#ifdef NS_ASSUME_NONNULL_END
+  NS_ASSUME_NONNULL_END
+#endif
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse.m
new file mode 100644
index 000000000..69d846a74
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse.m
@@ -0,0 +1,187 @@
+/***********************************************************************************
+ *
+ * Copyright (c) 2012 Olivier Halligon
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ ***********************************************************************************/
+
+#if ! __has_feature(objc_arc)
+#error This file is expected to be compiled with ARC turned ON
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Imports
+
+#import "OHHTTPStubsResponse.h"
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Defines & Constants
+
+const double OHHTTPStubsDownloadSpeedGPRS   =-    56 / 8; // kbps -> KB/s
+const double OHHTTPStubsDownloadSpeedEDGE   =-   128 / 8; // kbps -> KB/s
+const double OHHTTPStubsDownloadSpeed3G     =-  3200 / 8; // kbps -> KB/s
+const double OHHTTPStubsDownloadSpeed3GPlus =-  7200 / 8; // kbps -> KB/s
+const double OHHTTPStubsDownloadSpeedWifi   =- 12000 / 8; // kbps -> KB/s
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Implementation
+
+@implementation OHHTTPStubsResponse
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Commodity Constructors
+
+
+#pragma mark > Building response from NSData
+
++(instancetype)responseWithData:(NSData*)data
+                     statusCode:(int)statusCode
+                        headers:(NSDictionary*)httpHeaders
+{
+    OHHTTPStubsResponse* response = [[self alloc] initWithData:data
+                                                    statusCode:statusCode
+                                                       headers:httpHeaders];
+    return response;
+}
+
+
+#pragma mark > Building response from a file
+
++(instancetype)responseWithFileAtPath:(NSString *)filePath
+                           statusCode:(int)statusCode
+                              headers:(NSDictionary *)httpHeaders
+{
+    OHHTTPStubsResponse* response = [[self alloc] initWithFileAtPath:filePath
+                                                          statusCode:statusCode
+                                                             headers:httpHeaders];
+    return response;
+}
+
+
+#pragma mark > Building an error response
+
++(instancetype)responseWithError:(NSError*)error
+{
+    OHHTTPStubsResponse* response = [[self  alloc] initWithError:error];
+    return response;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Commotidy Setters
+
+-(instancetype)responseTime:(NSTimeInterval)responseTime
+{
+    _responseTime = responseTime;
+    return self;
+}
+
+-(instancetype)requestTime:(NSTimeInterval)requestTime responseTime:(NSTimeInterval)responseTime
+{
+    _requestTime = requestTime;
+    _responseTime = responseTime;
+    return self;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Initializers
+
+-(instancetype)initWithInputStream:(NSInputStream*)inputStream
+                          dataSize:(unsigned long long)dataSize
+                        statusCode:(int)statusCode
+                           headers:(NSDictionary*)httpHeaders
+{
+    self = [super init];
+    if (self)
+    {
+        _inputStream = inputStream;
+        _dataSize = dataSize;
+        _statusCode = statusCode;
+        NSMutableDictionary * headers = [NSMutableDictionary dictionaryWithDictionary:httpHeaders];
+        static NSString *const ContentLengthHeader = @"Content-Length";
+        if (!headers[ContentLengthHeader])
+        {
+            headers[ContentLengthHeader] = [NSString stringWithFormat:@"%llu",_dataSize];
+        }
+        _httpHeaders = [NSDictionary dictionaryWithDictionary:headers];
+    }
+    return self;
+}
+
+-(instancetype)initWithFileAtPath:(NSString*)filePath
+                       statusCode:(int)statusCode
+                          headers:(NSDictionary*)httpHeaders
+{
+    NSInputStream* inputStream;
+    if (filePath)
+    {
+        inputStream = [NSInputStream inputStreamWithFileAtPath:filePath];
+    }
+    else
+    {
+        NSLog(@"%s: nil file path. Returning empty data", __PRETTY_FUNCTION__);
+        inputStream = [NSInputStream inputStreamWithData:[NSData data]];
+    }
+    
+    NSDictionary* attributes = [NSFileManager.defaultManager attributesOfItemAtPath:filePath error:nil];
+    unsigned long long fileSize = [[attributes valueForKey:NSFileSize] unsignedLongLongValue];
+    self = [self initWithInputStream:inputStream
+                            dataSize:fileSize
+                          statusCode:statusCode
+                             headers:httpHeaders];
+    return self;
+}
+
+-(instancetype)initWithData:(NSData*)data
+                 statusCode:(int)statusCode
+                    headers:(NSDictionary*)httpHeaders
+{
+    NSInputStream* inputStream = [NSInputStream inputStreamWithData:data?:[NSData data]];
+    self = [self initWithInputStream:inputStream
+                            dataSize:data.length
+                          statusCode:statusCode
+                             headers:httpHeaders];
+    return self;
+}
+
+-(instancetype)initWithError:(NSError*)error
+{
+    self = [super init];
+    if (self) {
+        _error = error;
+    }
+    return self;
+}
+
+-(NSString*)debugDescription
+{
+    return [NSString stringWithFormat:@"<%@ %p requestTime:%f responseTime:%f status:%d dataSize:%llu>",
+            self.class, self, self.requestTime, self.responseTime, self.statusCode, self.dataSize];
+}
+
+////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Accessors
+
+-(void)setRequestTime:(NSTimeInterval)requestTime
+{
+    NSAssert(requestTime >= 0, @"Invalid Request Time (%f) for OHHTTPStubResponse. Request time must be greater than or equal to zero",requestTime);
+    _requestTime = requestTime;
+}
+
+@end
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHPathHelpers.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHPathHelpers.h
new file mode 100644
index 000000000..aa250547b
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHPathHelpers.h
@@ -0,0 +1,77 @@
+//
+//  OHPathHelpers.h
+//  Pods
+//
+//  Created by Olivier Halligon on 18/04/2015.
+//
+//
+
+#import <Foundation/Foundation.h>
+
+#ifdef NS_ASSUME_NONNULL_BEGIN
+  NS_ASSUME_NONNULL_BEGIN
+  #define _nullable_ __nullable
+#else
+  #define _nullable_
+#endif
+
+
+/**
+ *  Useful function to build a path given a file name and a class.
+ *
+ *  @param fileName The name of the file to get the path to, including file extension
+ *  @param inBundleForClass The class of the caller, used to determine the current bundle
+ *                          in which the file is supposed to be located.
+ *                          You should typically pass `self.class` (ObjC) or
+ *                          `self.dynamicType` (Swift) when calling this function.
+ *
+ *  @return The path of the given file in the same bundle as the inBundleForClass class
+ */
+NSString* _nullable_ OHPathForFile(NSString* fileName, Class inBundleForClass);
+
+/**
+ *  Useful function to build a path given a file name and a bundle.
+ *
+ *  @param fileName The name of the file to get the path to, including file extension
+ *  @param bundle The bundle in which the file is supposed to be located.
+ *                This parameter can't be null.
+ *
+ *  @return The path of the given file in given bundle
+ *
+ *  @note You should avoid using `[NSBundle mainBundle]` for the `bundle` parameter,
+ *        as in the context of Unit Tests, this points to the Simulator's bundle,
+ *        not the bundle of the app under test. That's why `nil` is not an acceptable
+ *        value (so you won't expect it to default to the `mainBundle`).
+ *        You should use `[NSBundle bundleForClass:]` instead.
+ */
+NSString* _nullable_ OHPathForFileInBundle(NSString* fileName, NSBundle* bundle);
+
+/**
+ *  Useful function to build a path to a file in the Documents's directory in the
+ *  app sandbox, used by iTunes File Sharing for example.
+ *
+ *  @param fileName The name of the file to get the path to, including file extension
+ *
+ *  @return The path of the file in the Documents directory in your App Sandbox
+ */
+NSString* _nullable_ OHPathForFileInDocumentsDir(NSString* fileName);
+
+
+
+/**
+ *  Useful function to build an NSBundle located in the application's resources simply from its name
+ *
+ *  @param bundleBasename The base name, without extension (extension is assumed to be ".bundle").
+ *  @param inBundleForClass The class of the caller, used to determine the current bundle
+ *                          in which the file is supposed to be located.
+ *                          You should typically pass `self.class` (ObjC) or
+ *                          `self.dynamicType` (Swift) when calling this function.
+ *
+ *  @return The NSBundle object representing the bundle with the given basename located in your application's resources.
+ */
+NSBundle* _nullable_ OHResourceBundle(NSString* bundleBasename, Class inBundleForClass);
+
+
+#ifdef NS_ASSUME_NONNULL_END
+  NS_ASSUME_NONNULL_END
+#endif
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHPathHelpers.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHPathHelpers.m
new file mode 100644
index 000000000..cac24a636
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHPathHelpers.m
@@ -0,0 +1,35 @@
+//
+//  OHPathHelpers.m
+//  Pods
+//
+//  Created by Olivier Halligon on 18/04/2015.
+//
+//
+
+#import "OHPathHelpers.h"
+
+NSString* OHPathForFile(NSString* fileName, Class inBundleForClass)
+{
+    NSBundle* bundle = [NSBundle bundleForClass:inBundleForClass];
+    return OHPathForFileInBundle(fileName, bundle);
+}
+
+NSString* OHPathForFileInBundle(NSString* fileName, NSBundle* bundle)
+{
+    return [bundle pathForResource:[fileName stringByDeletingPathExtension]
+                            ofType:[fileName pathExtension]];
+}
+
+NSString* OHPathForFileInDocumentsDir(NSString* fileName)
+{
+    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+    NSString *basePath = (paths.count > 0) ? [paths objectAtIndex:0] : nil;
+    return [basePath stringByAppendingPathComponent:fileName];
+}
+
+NSBundle* OHResourceBundleForClass(NSString* bundleBasename, Class inBundleForClass)
+{
+    NSBundle* classBundle = [NSBundle bundleForClass:inBundleForClass];
+    return [NSBundle bundleWithPath:[classBundle pathForResource:bundleBasename
+                                                         ofType:@"bundle"]];
+}
\ No newline at end of file
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Supporting Files/OHHTTPStubs Mac-Info.plist b/test/ios/OHHTTPStubs/OHHTTPStubs/Supporting Files/OHHTTPStubs Mac-Info.plist
new file mode 100644
index 000000000..a3da7a555
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Supporting Files/OHHTTPStubs Mac-Info.plist	
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>com.alisoftware.${PRODUCT_NAME:rfc1034identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2014 AliSoftware. All rights reserved.</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Supporting Files/OHHTTPStubs iOS-Info.plist b/test/ios/OHHTTPStubs/OHHTTPStubs/Supporting Files/OHHTTPStubs iOS-Info.plist
new file mode 100644
index 000000000..a321905ba
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Supporting Files/OHHTTPStubs iOS-Info.plist	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.alisoftware.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Fixtures/emptyfile.json b/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Fixtures/emptyfile.json
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/AFNetworkingTests.m b/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/AFNetworkingTests.m
new file mode 100644
index 000000000..f0dcc952c
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/AFNetworkingTests.m	
@@ -0,0 +1,226 @@
+/***********************************************************************************
+ *
+ * Copyright (c) 2012 Olivier Halligon
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ ***********************************************************************************/
+
+#import <XCTest/XCTest.h>
+#import "OHHTTPStubs.h"
+#import "OHHTTPStubsResponse+JSON.h"
+
+#import "AFHTTPRequestOperation.h"
+
+static const NSTimeInterval kResponseTimeTolerence = 1.0;
+
+@interface AFNetworkingTests : XCTestCase @end
+
+@implementation AFNetworkingTests
+
+-(void)setUp
+{
+    [super setUp];
+    [OHHTTPStubs removeAllStubs];
+}
+
+-(void)test_AFHTTPRequestOperation_success
+{
+    static const NSTimeInterval kRequestTime = 0.05;
+    static const NSTimeInterval kResponseTime = 0.1;
+    NSData* expectedResponse = [NSStringFromSelector(_cmd) dataUsingEncoding:NSUTF8StringEncoding];
+    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+        return YES;
+    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+        return [[OHHTTPStubsResponse responseWithData:expectedResponse statusCode:200 headers:nil]
+                requestTime:kRequestTime responseTime:kResponseTime];
+    }];
+    
+    XCTestExpectation* expectation = [self expectationWithDescription:@"AFHTTPRequestOperation request finished"];
+    
+    NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.iana.org/domains/example/"]];
+    AFHTTPRequestOperation* op = [[AFHTTPRequestOperation alloc] initWithRequest:req];
+    [op setResponseSerializer:[AFHTTPResponseSerializer serializer]];
+    __block __strong id response = nil;
+    [op setCompletionBlockWithSuccess:^(AFHTTPRequestOperation *operation, id responseObject) {
+        response = responseObject; // keep strong reference
+        [expectation fulfill];
+    } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
+        XCTFail(@"Unexpected network failure");
+        [expectation fulfill];
+    }];
+    [op start];
+    
+    [self waitForExpectationsWithTimeout:kRequestTime+kResponseTime+kResponseTimeTolerence handler:nil];
+    
+    XCTAssertEqualObjects(response, expectedResponse, @"Unexpected data received");
+}
+
+-(void)test_AFHTTPRequestOperation_multiple_choices
+{
+    static const NSTimeInterval kRequestTime = 0.05;
+    static const NSTimeInterval kResponseTime = 0.1;
+    NSData* expectedResponse = [NSStringFromSelector(_cmd) dataUsingEncoding:NSUTF8StringEncoding];
+    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+        return YES;
+    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+        return [[OHHTTPStubsResponse responseWithData:expectedResponse statusCode:300 headers:@{@"Location":@"http://www.iana.org/domains/another/example"}]
+                requestTime:kRequestTime responseTime:kResponseTime];
+    }];
+    
+    XCTestExpectation* expectation = [self expectationWithDescription:@"AFHTTPRequestOperation request finished"];
+    
+    NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.iana.org/domains/example/"]];
+    AFHTTPRequestOperation* op = [[AFHTTPRequestOperation alloc] initWithRequest:req];
+    AFHTTPResponseSerializer* serializer = [AFHTTPResponseSerializer serializer];
+    [serializer  setAcceptableStatusCodes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(200, 101)]];
+    [op setResponseSerializer:serializer];
+
+    __block __strong id response = nil;
+    [op setRedirectResponseBlock:^NSURLRequest *(NSURLConnection *connection, NSURLRequest *request, NSURLResponse *redirectResponse) {
+        if (redirectResponse == nil) {
+            return request;
+        }
+        XCTFail(@"Unexpected redirect");
+        return nil;
+    }];
+    
+    [op setCompletionBlockWithSuccess:^(AFHTTPRequestOperation *operation, id responseObject) {
+        response = responseObject; // keep strong reference
+        [expectation fulfill];
+    } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
+        XCTFail(@"Unexpected network failure");
+        [expectation fulfill];
+    }];
+    [op start];
+    
+    [self waitForExpectationsWithTimeout:kRequestTime+kResponseTime+kResponseTimeTolerence handler:nil];
+    
+    XCTAssertEqualObjects(response, expectedResponse, @"Unexpected data received");
+}
+
+-(void)test_AFHTTPRequestOperation_redirect
+{
+    static const NSTimeInterval kRequestTime = 0.05;
+    static const NSTimeInterval kResponseTime = 0.1;
+    
+    NSURL* redirectURL = [NSURL URLWithString:@"http://www.iana.org/domains/another/example"];
+    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+        return YES;
+    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+        return [[OHHTTPStubsResponse responseWithData:[NSData data] statusCode:311 headers:@{@"Location":redirectURL.absoluteString}]
+                requestTime:kRequestTime responseTime:kResponseTime];
+    }];
+    
+    XCTestExpectation* expectation = [self expectationWithDescription:@"AFHTTPRequestOperation request finished"];
+    
+    NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.iana.org/domains/example/"]];
+    AFHTTPRequestOperation* op = [[AFHTTPRequestOperation alloc] initWithRequest:req];
+    [op setResponseSerializer:[AFHTTPResponseSerializer serializer]];
+    
+    __block __strong NSURL* url = nil;
+    [op setRedirectResponseBlock:^NSURLRequest *(NSURLConnection *connection, NSURLRequest *request, NSURLResponse *redirectResponse) {
+        if (redirectResponse == nil) {
+            return request;
+        }
+        url = request.URL;
+        [expectation fulfill];
+        return nil;
+    }];
+    
+    [op setCompletionBlockWithSuccess:^(AFHTTPRequestOperation *operation, id responseObject) {
+        XCTFail(@"Unexpected response");
+        [expectation fulfill];
+    } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
+        XCTFail(@"Unexpected network failure");
+        [expectation fulfill];
+    }];
+    [op start];
+    
+    [self waitForExpectationsWithTimeout:kRequestTime+kResponseTime+kResponseTimeTolerence handler:nil];
+    
+    XCTAssertEqualObjects(url, redirectURL, @"Unexpected data received");
+}
+
+@end
+
+
+
+#pragma mark - NSURLSession / AFHTTPURLSession support
+
+// Compile this only if SDK version (…MAX_ALLOWED) is iOS7+/10.9+ because NSURLSession is a class only known starting these SDKs
+// (this code won't compile if we use an eariler SDKs, like when building with Xcode4)
+#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000) \
+ || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090)
+
+#import "AFHTTPSessionManager.h"
+
+@interface AFNetworkingTests (NSURLSession) @end
+@implementation AFNetworkingTests (NSURLSession)
+
+- (void)test_AFHTTPURLSessionCustom
+{
+    if ([NSURLSession class] && [NSURLSessionConfiguration class])
+    {
+        static const NSTimeInterval kRequestTime = 0.1;
+        static const NSTimeInterval kResponseTime = 0.2;
+        NSDictionary *expectedResponseDict = @{@"Success" : @"Yes"};
+        
+        [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+            return [request.URL.scheme isEqualToString:@"stubs"];
+        } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+            return [[OHHTTPStubsResponse responseWithJSONObject:expectedResponseDict statusCode:200 headers:nil]
+                    requestTime:kRequestTime responseTime:kResponseTime];
+        }];
+        
+        XCTestExpectation* expectation = [self expectationWithDescription:@"AFHTTPSessionManager request finished"];
+        
+        NSURLSessionConfiguration *sessionConfig = [NSURLSessionConfiguration defaultSessionConfiguration];
+        NSURL* baseURL = [NSURL URLWithString:@"stubs://stubs/"];
+        AFHTTPSessionManager *sessionManager = [[AFHTTPSessionManager alloc] initWithBaseURL:baseURL
+                                                                        sessionConfiguration:sessionConfig];
+        
+        __block __strong id response = nil;
+        [sessionManager GET:@"foo"
+                 parameters:nil
+                    success:^(NSURLSessionDataTask *task, id responseObject) {
+                        response = responseObject; // keep strong reference
+                        [expectation fulfill];
+                    }
+                    failure:^(NSURLSessionDataTask *task, NSError *error) {
+                        XCTFail(@"Unexpected network failure");
+                        [expectation fulfill];
+                    }];
+        
+        [self waitForExpectationsWithTimeout:kRequestTime+kResponseTime+kResponseTimeTolerence handler:nil];
+        
+        XCTAssertEqualObjects(response, expectedResponseDict, @"Unexpected data received");
+    }
+    else
+    {
+        NSLog(@"/!\\ Test skipped because the NSURLSession class is not available on this OS version. Run the tests a target with a more recent OS.\n");
+    }
+}
+
+@end
+
+#else
+#warning Unit Tests using NSURLSession were not compiled nor executed, because NSURLSession is only available since iOS7/OSX10.9 SDK. \
+-------- Compile using iOS7 or OSX10.9 SDK then launch the tests on the iOS7 simulator or an OSX10.9 target for them to be executed.
+#endif
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionDelegateTests.m b/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionDelegateTests.m
new file mode 100644
index 000000000..2a37ff129
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionDelegateTests.m	
@@ -0,0 +1,394 @@
+/***********************************************************************************
+ *
+ * Copyright (c) 2012 Olivier Halligon
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ ***********************************************************************************/
+
+#import <XCTest/XCTest.h>
+#import "OHHTTPStubs.h"
+
+@interface NSURLConnectionDelegateTests : XCTestCase <NSURLConnectionDataDelegate> @end
+
+static const NSTimeInterval kResponseTimeTolerence = 0.2;
+
+@implementation NSURLConnectionDelegateTests
+{
+    NSMutableData* _data;
+    NSError* _error;
+    
+    NSURL* _redirectRequestURL;
+    NSInteger _redirectResponseStatusCode;
+    
+    XCTestExpectation* _connectionFinishedExpectation;
+}
+
+///////////////////////////////////////////////////////////////////////////////////
+#pragma mark Global Setup + NSURLConnectionDelegate implementation
+///////////////////////////////////////////////////////////////////////////////////
+
+-(void)setUp
+{
+    [super setUp];
+    _data = [[NSMutableData alloc] init];
+    [OHHTTPStubs removeAllStubs];
+}
+
+-(void)tearDown
+{
+    // in case the test timed out and finished before a running NSURLConnection ended,
+    // we may continue receive delegate messages anyway if we forgot to cancel.
+    // So avoid sending messages to deallocated object in this case by ensuring we reset it to nil
+    _data = nil;
+    _error = nil;
+    _connectionFinishedExpectation = nil;
+    [super tearDown];
+}
+
+- (NSURLRequest *)connection:(NSURLConnection *)connection willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response
+{
+    _redirectRequestURL = request.URL;
+    if (response)
+    {
+        if ([response isKindOfClass:NSHTTPURLResponse.class])
+        {
+            _redirectResponseStatusCode = [((NSHTTPURLResponse *) response) statusCode];
+        }
+        else
+        {
+            _redirectResponseStatusCode = 0;
+        }
+    }
+    else
+    {
+        // we get a nil response when NSURLConnection canonicalizes the URL, we don't care about that.
+    }
+    return request;
+}
+
+-(void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response
+{
+    [_data setLength:0U];
+}
+
+-(void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data
+{
+    [_data appendData:data];
+}
+
+-(void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error
+{
+    _error = error; // keep strong reference
+    [_connectionFinishedExpectation fulfill];
+}
+
+-(void)connectionDidFinishLoading:(NSURLConnection *)connection
+{
+    [_connectionFinishedExpectation fulfill];
+}
+
+
+
+///////////////////////////////////////////////////////////////////////////////////
+#pragma mark NSURLConnection + Delegate
+///////////////////////////////////////////////////////////////////////////////////
+
+-(void)test_NSURLConnectionDelegate_success
+{
+    static const NSTimeInterval kRequestTime = 0.1;
+    static const NSTimeInterval kResponseTime = 0.5;
+    NSData* testData = [NSStringFromSelector(_cmd) dataUsingEncoding:NSUTF8StringEncoding];
+    
+    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+        return YES;
+    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+        return [[OHHTTPStubsResponse responseWithData:testData
+                                           statusCode:200
+                                              headers:nil]
+                requestTime:kRequestTime responseTime:kResponseTime];
+    }];
+    
+    _connectionFinishedExpectation = [self expectationWithDescription:@"NSURLConnection did finish (with error or success)"];
+    
+    NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.iana.org/domains/example/"]];
+    NSDate* startDate = [NSDate date];
+    
+    NSURLConnection* cxn = [NSURLConnection connectionWithRequest:req delegate:self];
+    
+    [self waitForExpectationsWithTimeout:kRequestTime+kResponseTime+kResponseTimeTolerence handler:nil];
+    
+    XCTAssertEqualObjects(_data, testData, @"Invalid data response");
+    XCTAssertNil(_error, @"Received unexpected network error %@", _error);
+    XCTAssertEqualWithAccuracy(-[startDate timeIntervalSinceNow], kRequestTime+kResponseTime, kResponseTimeTolerence, @"Invalid response time");
+    
+    // in case we timed out before the end of the request (test failed), cancel the request to avoid further delegate method calls
+    [cxn cancel];
+}
+
+-(void)test_NSURLConnectionDelegate_multiple_choices
+{
+    static const NSTimeInterval kRequestTime = 0.1;
+    static const NSTimeInterval kResponseTime = 0.5;
+    NSData* testData = [NSStringFromSelector(_cmd) dataUsingEncoding:NSUTF8StringEncoding];
+    
+    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+        return YES;
+    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+        return [[OHHTTPStubsResponse responseWithData:testData
+                                           statusCode:300
+                                              headers:@{@"Location":@"http://www.iana.org/domains/another/example"}]
+                requestTime:kRequestTime responseTime:kResponseTime];
+    }];
+    
+    _connectionFinishedExpectation = [self expectationWithDescription:@"NSURLConnection did finish (with error or success)"];
+    
+    NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.iana.org/domains/example/"]];
+    NSDate* startDate = [NSDate date];
+    
+    NSURLConnection* cxn = [NSURLConnection connectionWithRequest:req delegate:self];
+    
+    [self waitForExpectationsWithTimeout:kRequestTime+kResponseTime+kResponseTimeTolerence handler:nil];
+    
+    XCTAssertEqualObjects(_data, testData, @"Invalid data response");
+    XCTAssertNil(_error, @"Received unexpected network error %@", _error);
+    XCTAssertEqualWithAccuracy(-[startDate timeIntervalSinceNow], kRequestTime+kResponseTime, kResponseTimeTolerence, @"Invalid response time");
+    
+    // in case we timed out before the end of the request (test failed), cancel the request to avoid further delegate method calls
+    [cxn cancel];
+}
+
+-(void)test_NSURLConnectionDelegate_error
+{
+    static const NSTimeInterval kResponseTime = 0.5;
+    NSError* expectedError = [NSError errorWithDomain:NSURLErrorDomain code:404 userInfo:nil];
+    
+    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+        return YES;
+    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+        OHHTTPStubsResponse* resp = [OHHTTPStubsResponse responseWithError:expectedError];
+        resp.responseTime = kResponseTime;
+        return resp;
+    }];
+    
+    _connectionFinishedExpectation = [self expectationWithDescription:@"NSURLConnection did finish (with error or success)"];
+    
+    NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.iana.org/domains/example/"]];
+    NSDate* startDate = [NSDate date];
+    
+    NSURLConnection* cxn = [NSURLConnection connectionWithRequest:req delegate:self];
+    
+    [self waitForExpectationsWithTimeout:kResponseTime+kResponseTimeTolerence handler:nil];
+    
+    XCTAssertEqual(_data.length, (NSUInteger)0, @"Received unexpected network data %@", _data);
+    XCTAssertEqualObjects(_error.domain, expectedError.domain, @"Invalid error response domain");
+    XCTAssertEqual(_error.code, expectedError.code, @"Invalid error response code");
+    XCTAssertEqualWithAccuracy(-[startDate timeIntervalSinceNow], kResponseTime, kResponseTimeTolerence, @"Invalid response time");
+    
+    // in case we timed out before the end of the request (test failed), cancel the request to avoid further delegate method calls
+    [cxn cancel];
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////
+#pragma mark Cancelling requests
+///////////////////////////////////////////////////////////////////////////////////
+
+-(void)test_NSURLConnection_cancel
+{
+    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+        return YES;
+    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+        return [[OHHTTPStubsResponse responseWithData:[@"<this data should never have time to arrive>" dataUsingEncoding:NSUTF8StringEncoding]
+                                           statusCode:500
+                                              headers:nil]
+                requestTime:0.0 responseTime:1.5];
+    }];
+    
+    NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.iana.org/domains/example/"]];
+    NSURLConnection* cxn = [NSURLConnection connectionWithRequest:req delegate:self];
+    
+    XCTestExpectation* waitExpectation = [self expectationWithDescription:@"Waiting 2s, after cancelling in the middle"];
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [cxn cancel];
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [waitExpectation fulfill];
+        });
+    });
+
+    [self waitForExpectationsWithTimeout:5 handler:^(NSError *error) {
+        // in case we timed out before the end of the request (test failed), cancel the request to avoid further delegate method calls
+        [cxn cancel];
+    }];
+    
+    XCTAssertEqual(_data.length, (NSUInteger)0, @"Received unexpected data but the request should have been cancelled");
+    XCTAssertNil(_error, @"Received unexpected network error but the request should have been cancelled");
+    
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////
+#pragma mark Cancelling requests
+///////////////////////////////////////////////////////////////////////////////////
+
+-(void)test_NSURLConnection_cookies
+{
+    NSString* const cookieName = @"SESSIONID";
+    NSString* const cookieValue = [NSProcessInfo.processInfo globallyUniqueString];
+    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+        return YES;
+    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+        NSString* cookie = [NSString stringWithFormat:@"%@=%@;", cookieName, cookieValue];
+        NSDictionary* headers = @{@"Set-Cookie": cookie};
+        return [[OHHTTPStubsResponse responseWithData:[@"Yummy cookies" dataUsingEncoding:NSUTF8StringEncoding]
+                                           statusCode:200
+                                              headers:headers]
+                requestTime:0.0 responseTime:0.1];
+    }];
+    
+    _connectionFinishedExpectation = [self expectationWithDescription:@"NSURLConnection did finish (with error or success)"];
+    
+    // Set the cookie accept policy to accept all cookies from the main document domain
+    // (especially in case the previous policy was "NSHTTPCookieAcceptPolicyNever")
+    NSHTTPCookieStorage* cookieStorage = NSHTTPCookieStorage.sharedHTTPCookieStorage;
+    NSHTTPCookieAcceptPolicy previousAcceptPolicy = cookieStorage.cookieAcceptPolicy; // keep it to restore later
+    [cookieStorage setCookieAcceptPolicy:NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain];
+    
+    // Send the request and wait for the response containing the Set-Cookie headers
+    NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.iana.org/domains/example/"]];
+    NSURLConnection* cxn = [NSURLConnection connectionWithRequest:req delegate:self];
+    [self waitForExpectationsWithTimeout:kResponseTimeTolerence handler:^(NSError *error) {
+        [cxn cancel]; // In case we timed out (test failed), cancel the request to avoid further delegate method calls
+    }];
+    
+    /* Check that the cookie has been properly stored */
+    NSArray* cookies = [cookieStorage cookiesForURL:req.URL];
+    BOOL cookieFound = NO;
+    for (NSHTTPCookie* cookie in cookies)
+    {
+        if ([cookie.name isEqualToString:cookieName])
+        {
+            cookieFound = YES;
+            XCTAssertEqualObjects(cookie.value, cookieValue, @"The cookie does not have the expected value");
+        }
+    }
+    XCTAssertTrue(cookieFound, @"The cookie was not stored as expected");
+    
+
+    // As a courtesy, restore previous policy before leaving
+    [cookieStorage setCookieAcceptPolicy:previousAcceptPolicy];
+
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////
+#pragma mark Redirected requests
+///////////////////////////////////////////////////////////////////////////////////
+
+- (void)test_NSURLConnection_redirected
+{
+    static const NSTimeInterval kRequestTime = 0.1;
+    static const NSTimeInterval kResponseTime = 0.5;
+    NSData* redirectData = [[NSString stringWithFormat:@"%@ - redirect", NSStringFromSelector(_cmd)] dataUsingEncoding:NSUTF8StringEncoding];
+    NSData* testData = [NSStringFromSelector(_cmd) dataUsingEncoding:NSUTF8StringEncoding];
+    NSURL* redirectURL = [NSURL URLWithString:@"http://www.yahoo.com/"];
+    NSString* redirectCookieName = @"yahooCookie";
+    NSString* redirectCookieValue = [NSProcessInfo.processInfo globallyUniqueString];
+    
+    // Set the cookie accept policy to accept all cookies from the main document domain
+    // (especially in case the previous policy was "NSHTTPCookieAcceptPolicyNever")
+    NSHTTPCookieStorage* cookieStorage = NSHTTPCookieStorage.sharedHTTPCookieStorage;
+    NSHTTPCookieAcceptPolicy previousAcceptPolicy = cookieStorage.cookieAcceptPolicy; // keep it to restore later
+    [cookieStorage setCookieAcceptPolicy:NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain];
+    
+    NSString* endCookieName = @"googleCookie";
+    NSString* endCookieValue = [NSProcessInfo.processInfo globallyUniqueString];
+    NSURL *endURL = [NSURL URLWithString:@"http://www.google.com/"];
+    
+    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+        return YES;
+    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+        if ([request.URL isEqual:redirectURL]) {
+            NSString* redirectCookie = [NSString stringWithFormat:@"%@=%@;", redirectCookieName, redirectCookieValue];
+            NSDictionary* headers = @{ @"Location": endURL.absoluteString,
+                                       @"Set-Cookie": redirectCookie };
+            return [[OHHTTPStubsResponse responseWithData:redirectData
+                                               statusCode:311 // any 300-level request will do
+                                                  headers:headers]
+                    requestTime:kRequestTime responseTime:kResponseTime];
+        } else {
+            NSString* endCookie = [NSString stringWithFormat:@"%@=%@;", endCookieName, endCookieValue];
+            NSDictionary* headers = @{ @"Set-Cookie": endCookie };
+            return [[OHHTTPStubsResponse responseWithData:testData
+                                               statusCode:200
+                                                  headers:headers]
+                    requestTime:kRequestTime responseTime:kResponseTime];
+        }
+    }];
+    
+    _connectionFinishedExpectation = [self expectationWithDescription:@"NSURLConnection did finish (with error or success)"];
+    
+    NSURLRequest* req = [NSURLRequest requestWithURL:redirectURL];
+    NSDate* startDate = [NSDate date];
+    
+    NSURLConnection* cxn = [NSURLConnection connectionWithRequest:req delegate:self];
+    
+    [self waitForExpectationsWithTimeout:2 * (kRequestTime+kResponseTime+kResponseTimeTolerence) handler:^(NSError *error) {
+        // in case we timed out before the end of the request (test failed), cancel the request to avoid further delegate method calls
+        [cxn cancel];
+    }];
+    
+    XCTAssertEqualObjects(_redirectRequestURL, endURL, @"Invalid redirect request URL");
+    XCTAssertEqual(_redirectResponseStatusCode, (NSInteger)311, @"Invalid redirect response status code");
+    XCTAssertEqualObjects(_data, testData, @"Invalid data response");
+    XCTAssertNil(_error, @"Received unexpected network error %@", _error);
+    XCTAssertEqualWithAccuracy(-[startDate timeIntervalSinceNow], (2 * kRequestTime) + kResponseTime, 2 * kResponseTimeTolerence, @"Invalid response time");
+    
+    /* Check that the redirect cookie has been properly stored */
+    NSArray* redirectCookies = [cookieStorage cookiesForURL:req.URL];
+    BOOL redirectCookieFound = NO;
+    for (NSHTTPCookie* cookie in redirectCookies)
+    {
+        if ([cookie.name isEqualToString:redirectCookieName])
+        {
+            redirectCookieFound = YES;
+            XCTAssertEqualObjects(cookie.value, redirectCookieValue, @"The redirect cookie does not have the expected value");
+        }
+    }
+    XCTAssertTrue(redirectCookieFound, @"The redirect cookie was not stored as expected");
+    
+    /* Check that the end cookie has been properly stored */
+    NSArray* endCookies = [cookieStorage cookiesForURL:endURL];
+    BOOL endCookieFound = NO;
+    for (NSHTTPCookie* cookie in endCookies)
+    {
+        if ([cookie.name isEqualToString:endCookieName])
+        {
+            endCookieFound = YES;
+            XCTAssertEqualObjects(cookie.value, endCookieValue, @"The end cookie does not have the expected value");
+        }
+    }
+    XCTAssertTrue(endCookieFound, @"The end cookie was not stored as expected");
+    
+    
+    // As a courtesy, restore previous policy before leaving
+    [cookieStorage setCookieAcceptPolicy:previousAcceptPolicy];
+}
+
+@end
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionTests.m b/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionTests.m
new file mode 100644
index 000000000..0621384db
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionTests.m	
@@ -0,0 +1,187 @@
+/***********************************************************************************
+ *
+ * Copyright (c) 2012 Olivier Halligon
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ ***********************************************************************************/
+
+#import <XCTest/XCTest.h>
+#import "OHHTTPStubs.h"
+
+@interface NSURLConnectionTests : XCTestCase @end
+
+static const NSTimeInterval kResponseTimeTolerence = 0.3;
+
+@implementation NSURLConnectionTests
+
+-(void)setUp
+{
+    [super setUp];
+    [OHHTTPStubs removeAllStubs];
+}
+
+static const NSTimeInterval kRequestTime = 0.1;
+static const NSTimeInterval kResponseTime = 0.5;
+
+///////////////////////////////////////////////////////////////////////////////////
+#pragma mark [NSURLConnection sendSynchronousRequest:returningResponse:error:]
+///////////////////////////////////////////////////////////////////////////////////
+
+-(void)test_NSURLConnection_sendSyncronousRequest_mainQueue
+{
+    NSData* testData = [NSStringFromSelector(_cmd) dataUsingEncoding:NSUTF8StringEncoding];
+    
+    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+        return YES;
+    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+        return [[OHHTTPStubsResponse responseWithData:testData
+                                           statusCode:200
+                                              headers:nil]
+                requestTime:kRequestTime responseTime:kResponseTime];
+    }];
+    
+    NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.iana.org/domains/example/"]];
+    NSDate* startDate = [NSDate date];
+    
+    NSData* data = [NSURLConnection sendSynchronousRequest:req returningResponse:NULL error:NULL];
+    
+    XCTAssertEqualObjects(data, testData, @"Invalid data response");
+    XCTAssertEqualWithAccuracy(-[startDate timeIntervalSinceNow], kRequestTime+kResponseTime, kResponseTimeTolerence, @"Invalid response time");
+}
+
+-(void)test_NSURLConnection_sendSyncronousRequest_parallelQueue
+{
+    XCTestExpectation* expectation = [self expectationWithDescription:@"Synchronous request completed"];
+    [[NSOperationQueue new] addOperationWithBlock:^{
+        [self test_NSURLConnection_sendSyncronousRequest_mainQueue];
+        [expectation fulfill];
+    }];
+    [self waitForExpectationsWithTimeout:kRequestTime+kResponseTime+kResponseTimeTolerence handler:nil];
+}
+
+///////////////////////////////////////////////////////////////////////////////////
+#pragma mark Single [NSURLConnection sendAsynchronousRequest:queue:completionHandler:]
+///////////////////////////////////////////////////////////////////////////////////
+
+-(void)_test_NSURLConnection_sendAsyncronousRequest_onOperationQueue:(NSOperationQueue*)queue
+{
+    NSData* testData = [NSStringFromSelector(_cmd) dataUsingEncoding:NSUTF8StringEncoding];
+    
+    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+        return YES;
+    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+        return [[OHHTTPStubsResponse responseWithData:testData
+                                           statusCode:200
+                                              headers:nil]
+                requestTime:kRequestTime responseTime:kResponseTime];
+    }];
+    
+    XCTestExpectation* expectation = [self expectationWithDescription:@"Asynchronous request finished"];
+    
+    NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.iana.org/domains/example/"]];
+    NSDate* startDate = [NSDate date];
+    
+    [NSURLConnection sendAsynchronousRequest:req queue:queue completionHandler:^(NSURLResponse* resp, NSData* data, NSError* error)
+     {
+         XCTAssertEqualObjects(data, testData, @"Invalid data response");
+         XCTAssertEqualWithAccuracy(-[startDate timeIntervalSinceNow], kRequestTime+kResponseTime, kResponseTimeTolerence, @"Invalid response time");
+         
+         [expectation fulfill];
+     }];
+    
+    [self waitForExpectationsWithTimeout:kRequestTime+kResponseTime+kResponseTimeTolerence handler:nil];
+}
+
+
+-(void)test_NSURLConnection_sendAsyncronousRequest_mainQueue
+{
+    [self _test_NSURLConnection_sendAsyncronousRequest_onOperationQueue:NSOperationQueue.mainQueue];
+}
+
+
+-(void)test_NSURLConnection_sendAsyncronousRequest_parallelQueue
+{
+    [self _test_NSURLConnection_sendAsyncronousRequest_onOperationQueue:[NSOperationQueue new]];
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////
+#pragma mark Multiple Parallel [NSURLConnection sendAsynchronousRequest:queue:completionHandler:]
+///////////////////////////////////////////////////////////////////////////////////
+
+-(void)_test_NSURLConnection_sendMultipleAsyncronousRequestsOnOperationQueue:(NSOperationQueue*)queue
+{
+    __block BOOL testFinished = NO;
+    NSData* (^dataForRequest)(NSURLRequest*) = ^(NSURLRequest* req) {
+        return [[NSString stringWithFormat:@"<Response for URL %@>",req.URL.absoluteString] dataUsingEncoding:NSUTF8StringEncoding];
+    };
+    
+    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+        return YES;
+    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+        NSData* retData = dataForRequest(request);
+        NSTimeInterval responseTime = [request.URL.lastPathComponent doubleValue];
+        return [[OHHTTPStubsResponse responseWithData:retData
+                                           statusCode:200
+                                              headers:nil]
+                requestTime:responseTime*.1 responseTime:responseTime];
+    }];
+    
+    // Reusable code to send a request that will respond in the given response time
+    void (^sendAsyncRequest)(NSTimeInterval) = ^(NSTimeInterval responseTime)
+    {
+        NSString* desc = [NSString stringWithFormat:@"Asynchronous request with response time %.f finished", responseTime];
+        XCTestExpectation* expectation = [self expectationWithDescription:desc];
+
+        NSString* urlString = [NSString stringWithFormat:@"http://dummyrequest/concurrent/time/%f",responseTime];
+        NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:urlString]];
+//        [SenTestLog testLogWithFormat:@"== Sending request %@\n", req];
+        NSDate* startDate = [NSDate date];
+        [NSURLConnection sendAsynchronousRequest:req queue:queue completionHandler:^(NSURLResponse* resp, NSData* data, NSError* error)
+         {
+//             [SenTestLog testLogWithFormat:@"== Received response for request %@\n", req];
+             XCTAssertEqualObjects(data, dataForRequest(req), @"Invalid data response");
+             XCTAssertEqualWithAccuracy(-[startDate timeIntervalSinceNow], (responseTime*.1)+responseTime, kResponseTimeTolerence, @"Invalid response time");
+             
+             if (!testFinished) [expectation fulfill];
+         }];
+    };
+
+    static NSTimeInterval time3 = 1.5, time2 = 1.0, time1 = 0.5;
+    sendAsyncRequest(time3); // send this one first, should receive last
+    sendAsyncRequest(time2); // send this one next, shoud receive 2nd
+    sendAsyncRequest(time1); // send this one last, should receive first
+
+    [self waitForExpectationsWithTimeout:MAX(time1,MAX(time2,time3))+kResponseTimeTolerence handler:nil];
+    testFinished = YES;
+}
+
+-(void)test_NSURLConnection_sendMultipleAsyncronousRequests_mainQueue
+{
+    [self _test_NSURLConnection_sendMultipleAsyncronousRequestsOnOperationQueue:NSOperationQueue.mainQueue];
+}
+
+-(void)test_NSURLConnection_sendMultipleAsyncronousRequests_parallelQueue
+{
+    [self _test_NSURLConnection_sendMultipleAsyncronousRequestsOnOperationQueue:[NSOperationQueue new]];
+}
+
+
+@end
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NSURLSessionTests.m b/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NSURLSessionTests.m
new file mode 100644
index 000000000..08f67e828
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NSURLSessionTests.m	
@@ -0,0 +1,228 @@
+/***********************************************************************************
+ *
+ * Copyright (c) 2012 Olivier Halligon
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ ***********************************************************************************/
+
+
+// Compile this only if SDK version (…MAX_ALLOWED) is iOS7+/10.9+ because NSURLSession is a class only known starting these SDKs
+// (this code won't compile if we use an eariler SDKs, like when building with Xcode4)
+#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000) \
+ || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090)
+
+#import <XCTest/XCTest.h>
+#import "OHHTTPStubs.h"
+#import "OHHTTPStubsResponse+JSON.h"
+
+@interface NSURLSessionTests : XCTestCase <NSURLSessionDataDelegate> @end
+
+@implementation NSURLSessionTests
+{
+    NSMutableData* _receivedData;
+    XCTestExpectation* _taskDidCompleteExpectation;
+}
+
+- (void)setUp
+{
+    [super setUp];
+    [OHHTTPStubs removeAllStubs];
+    _receivedData = nil;
+}
+
+- (void)_test_NSURLSession:(NSURLSession*)session
+               jsonForStub:(id)json
+                completion:(void(^)(NSError* errorResponse,id jsonResponse))completion
+{
+    if ([NSURLSession class])
+    {
+        static const NSTimeInterval kRequestTime = 0.0;
+        static const NSTimeInterval kResponseTime = 0.2;
+        
+        [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+            return YES;
+        } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+            return [[OHHTTPStubsResponse responseWithJSONObject:json statusCode:200 headers:nil]
+                    requestTime:kRequestTime responseTime:kResponseTime];
+        }];
+        
+        XCTestExpectation* expectation = [self expectationWithDescription:@"NSURLSessionDataTask completed"];
+        
+        __block __strong id dataResponse = nil;
+        __block __strong NSError* errorResponse = nil;
+        NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"foo://unknownhost:666"]];
+        [request setHTTPMethod:@"GET"];
+        [request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
+        [request setValue:@"application/json" forHTTPHeaderField:@"Accept"];
+        
+        NSURLSessionDataTask *task =  [session dataTaskWithRequest:request
+                                                 completionHandler:^(NSData *data, NSURLResponse *response, NSError *error)
+        {
+            errorResponse = error;
+            if (!error)
+            {
+                NSError *jsonError = nil;
+                NSDictionary *jsonObject = [NSJSONSerialization JSONObjectWithData:data options:0 error:&jsonError];
+                XCTAssertNil(jsonError, @"Unexpected error deserializing JSON response");
+                dataResponse = jsonObject;
+            }
+            [expectation fulfill];
+        }];
+
+        [task resume];
+        
+        [self waitForExpectationsWithTimeout:kRequestTime+kResponseTime+0.5 handler:nil];
+        
+        completion(errorResponse, dataResponse);
+    }
+}
+
+// The shared session use the same mechanism as NSURLConnection
+// (based on protocols registered via +[NSURLProtocol registerClass:] and all)
+// and no NSURLSessionConfiguration
+- (void)test_SharedNSURLSession
+{
+    if ([NSURLSession class])
+    {
+        NSURLSession *session = [NSURLSession sharedSession];
+        
+        NSDictionary* json = @{@"Success": @"Yes"};
+        [self _test_NSURLSession:session jsonForStub:json completion:^(NSError *errorResponse, id jsonResponse) {
+            XCTAssertNil(errorResponse, @"Unexpected error");
+            XCTAssertEqualObjects(jsonResponse, json, @"Unexpected data received");
+        }];
+    }
+    else
+    {
+        NSLog(@"/!\\ Test skipped because the NSURLSession class is not available on this OS version. Run the tests a target with a more recent OS.\n");
+    }
+}
+
+- (void)test_NSURLSessionDefaultConfig
+{
+    if ([NSURLSessionConfiguration class] && [NSURLSession class])
+    {
+        NSURLSessionConfiguration* config = [NSURLSessionConfiguration defaultSessionConfiguration];
+        NSURLSession *session = [NSURLSession sessionWithConfiguration:config];
+        
+        NSDictionary* json = @{@"Success": @"Yes"};
+        [self _test_NSURLSession:session jsonForStub:json completion:^(NSError *errorResponse, id jsonResponse) {
+            XCTAssertNil(errorResponse, @"Unexpected error");
+            XCTAssertEqualObjects(jsonResponse, json, @"Unexpected data received");
+        }];
+    }
+    else
+    {
+        NSLog(@"/!\\ Test skipped because the NSURLSession class is not available on this OS version. Run the tests a target with a more recent OS.\n");
+    }
+}
+
+- (void)test_NSURLSessionEphemeralConfig
+{
+    if ([NSURLSessionConfiguration class] && [NSURLSession class])
+    {
+        NSURLSessionConfiguration* config = [NSURLSessionConfiguration ephemeralSessionConfiguration];
+        NSURLSession *session = [NSURLSession sessionWithConfiguration:config];
+        
+        NSDictionary* json = @{@"Success": @"Yes"};
+        [self _test_NSURLSession:session jsonForStub:json completion:^(NSError *errorResponse, id jsonResponse) {
+            XCTAssertNil(errorResponse, @"Unexpected error");
+            XCTAssertEqualObjects(jsonResponse, json, @"Unexpected data received");
+        }];
+    }
+    else
+    {
+        NSLog(@"/!\\ Test skipped because the NSURLSession class is not available on this OS version. Run the tests a target with a more recent OS.\n");
+    }
+}
+
+- (void)test_NSURLSessionDefaultConfig_Disabled
+{
+    if ([NSURLSessionConfiguration class] && [NSURLSession class])
+    {
+        NSURLSessionConfiguration* config = [NSURLSessionConfiguration ephemeralSessionConfiguration];
+        [OHHTTPStubs setEnabled:NO forSessionConfiguration:config]; // Disable stubs for this session
+        NSURLSession *session = [NSURLSession sessionWithConfiguration:config];
+        
+        NSDictionary* json = @{@"Success": @"Yes"};
+        [self _test_NSURLSession:session jsonForStub:json completion:^(NSError *errorResponse, id jsonResponse) {
+            // Stubs were disable for this session, so we should get an error instead of the stubs data
+            XCTAssertNotNil(errorResponse, @"Expected error but none found");
+            XCTAssertNil(jsonResponse, @"Data should not have been received as stubs should be disabled");
+        }];
+    }
+    else
+    {
+        NSLog(@"/!\\ Test skipped because the NSURLSession class is not available on this OS version. Run the tests a target with a more recent OS.\n");
+    }
+}
+
+- (void)test_NSURLSession_DataTask_DelegateMethods
+{
+    if ([NSURLSessionConfiguration class] && [NSURLSession class])
+    {
+        NSData* expectedResponse = [NSStringFromSelector(_cmd) dataUsingEncoding:NSUTF8StringEncoding];
+        [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+            return [request.URL.scheme isEqualToString:@"stub"];
+        } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+            return [[OHHTTPStubsResponse responseWithData:expectedResponse statusCode:200 headers:nil]
+                    responseTime:0.5];
+        }];
+        
+        _taskDidCompleteExpectation = [self expectationWithDescription:@"NSURLSessionDataTask completion delegate method called"];
+        
+        NSURLSessionConfiguration* config = [NSURLSessionConfiguration defaultSessionConfiguration];
+        NSURLSession* session = [NSURLSession sessionWithConfiguration:config delegate:self delegateQueue:nil];
+        
+        [[session dataTaskWithURL:[NSURL URLWithString:@"stub://foo"]] resume];
+        
+        [self waitForExpectationsWithTimeout:5 handler:nil];
+        
+        XCTAssertEqualObjects(_receivedData, expectedResponse, @"Unexpected response");
+    }
+    else
+    {
+        NSLog(@"/!\\ Test skipped because the NSURLSession class is not available on this OS version. Run the tests a target with a more recent OS.\n");
+    }
+}
+
+//---------------------------------------------------------------
+#pragma mark - Delegate Methods
+
+- (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask didReceiveResponse:(NSURLResponse *)response completionHandler:(void (^)(NSURLSessionResponseDisposition))completionHandler
+{
+    _receivedData = [NSMutableData new];
+    completionHandler(NSURLSessionResponseAllow);
+}
+- (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask didReceiveData:(NSData *)data
+{
+    [_receivedData appendData:data];
+}
+- (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCompleteWithError:(NSError *)error
+{
+    [_taskDidCompleteExpectation fulfill];
+}
+
+@end
+
+#else
+#warning Unit Tests using NSURLSession were not compiled nor executed, because NSURLSession is only available since iOS7/OSX10.9 SDK. \
+-------- Compile using iOS7 or OSX10.9 SDK then launch the tests on the iOS7 simulator or an OSX10.9 target for them to be executed.
+#endif
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NilValuesTests.m b/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NilValuesTests.m
new file mode 100644
index 000000000..ea1317402
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NilValuesTests.m	
@@ -0,0 +1,213 @@
+/***********************************************************************************
+ *
+ * Copyright (c) 2012 Olivier Halligon
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ ***********************************************************************************/
+
+#import <XCTest/XCTest.h>
+#import "OHHTTPStubs.h"
+
+static const NSTimeInterval kResponseTimeTolerence = 0.3;
+
+@interface NilValuesTests : XCTestCase @end
+
+@implementation NilValuesTests
+
+-(void)setUp
+{
+    [super setUp];
+    [OHHTTPStubs removeAllStubs];
+}
+
+- (void)test_NilData
+{
+    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+        return YES;
+    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnonnull"
+        return [OHHTTPStubsResponse responseWithData:nil statusCode:400 headers:nil];
+#pragma clang diagnostic pop
+    }];
+    
+    XCTestExpectation* expectation = [self expectationWithDescription:@"Network request's completionHandler called"];
+    
+    NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.iana.org/domains/example/"]];
+    
+    [NSURLConnection sendAsynchronousRequest:req
+                                       queue:[NSOperationQueue mainQueue]
+                           completionHandler:^(NSURLResponse* resp, NSData* data, NSError* error)
+     {
+         XCTAssertEqual(data.length, (NSUInteger)0, @"Data should be empty");
+         
+         [expectation fulfill];
+     }];
+    
+    [self waitForExpectationsWithTimeout:kResponseTimeTolerence handler:nil];
+}
+
+- (void)test_EmptyData
+{
+    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+        return YES;
+    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+        return [[OHHTTPStubsResponse responseWithData:[NSData data] statusCode:400 headers:nil]
+                requestTime:0.01 responseTime:0.01];
+    }];
+    
+    XCTestExpectation* expectation = [self expectationWithDescription:@"Network request's completionHandler called"];
+    
+    NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.iana.org/domains/example/"]];
+    
+    [NSURLConnection sendAsynchronousRequest:req
+                                       queue:[NSOperationQueue mainQueue]
+                           completionHandler:^(NSURLResponse* resp, NSData* data, NSError* error)
+     {
+         XCTAssertEqual(data.length, (NSUInteger)0, @"Data should be empty");
+         
+         [expectation fulfill];
+     }];
+    
+    [self waitForExpectationsWithTimeout:kResponseTimeTolerence handler:nil];
+}
+
+- (void)test_NilPath
+{
+    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+        return YES;
+    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnonnull"
+        return [[OHHTTPStubsResponse responseWithFileAtPath:nil statusCode:501 headers:nil]
+                requestTime:0.01 responseTime:0.01];
+#pragma clang diagnostic pop
+    }];
+    
+    XCTestExpectation* expectation = [self expectationWithDescription:@"Network request's completionHandler called"];
+    
+    NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.iana.org/domains/example/"]];
+    
+    [NSURLConnection sendAsynchronousRequest:req
+                                       queue:[NSOperationQueue mainQueue]
+                           completionHandler:^(NSURLResponse* resp, NSData* data, NSError* error)
+     {
+         XCTAssertEqual(data.length, (NSUInteger)0, @"Data should be empty");
+         
+         [expectation fulfill];
+     }];
+    
+    [self waitForExpectationsWithTimeout:kResponseTimeTolerence handler:nil];
+}
+
+- (void)test_InvalidPath
+{
+    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+        return YES;
+    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+        return [[OHHTTPStubsResponse responseWithFileAtPath:@"-invalid-path-" statusCode:500 headers:nil]
+        requestTime:0.01 responseTime:0.01];
+    }];
+    
+    XCTestExpectation* expectation = [self expectationWithDescription:@"Network request's completionHandler called"];
+    
+    NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.iana.org/domains/example/"]];
+    
+    [NSURLConnection sendAsynchronousRequest:req
+                                       queue:[NSOperationQueue mainQueue]
+                           completionHandler:^(NSURLResponse* resp, NSData* data, NSError* error)
+     {
+         XCTAssertEqual(data.length, (NSUInteger)0, @"Data should be empty");
+         
+         [expectation fulfill];
+     }];
+    
+    [self waitForExpectationsWithTimeout:kResponseTimeTolerence handler:nil];
+}
+
+- (void)test_EmptyFile
+{
+    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+        return YES;
+    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+        NSString* emptyFile = OHPathForFile(@"emptyfile.json", self.class);
+        return [[OHHTTPStubsResponse responseWithFileAtPath:emptyFile statusCode:500 headers:nil]
+                requestTime:0.01 responseTime:0.01];
+    }];
+    
+    XCTestExpectation* expectation = [self expectationWithDescription:@"Network request's completionHandler called"];
+    
+    NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.iana.org/domains/example/"]];
+    
+    [NSURLConnection sendAsynchronousRequest:req
+                                       queue:[NSOperationQueue mainQueue]
+                           completionHandler:^(NSURLResponse* resp, NSData* data, NSError* error)
+     {
+         XCTAssertEqual(data.length, (NSUInteger)0, @"Data should be empty");
+         
+         [expectation fulfill];
+     }];
+    
+    [self waitForExpectationsWithTimeout:kResponseTimeTolerence handler:nil];
+}
+
+- (void)_test_NilURLAndCookieHandlingEnabled:(BOOL)handleCookiesEnabled
+{
+    NSData* expectedResponse = [NSStringFromSelector(_cmd) dataUsingEncoding:NSUTF8StringEncoding];
+    
+    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+        return YES;
+    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+        return [OHHTTPStubsResponse responseWithData:expectedResponse
+                                          statusCode:200
+                                             headers:nil];
+    }];
+    
+    XCTestExpectation* expectation = [self expectationWithDescription:@"Network request's completionHandler called"];
+    
+    NSMutableURLRequest* req = [NSMutableURLRequest requestWithURL:nil];
+    [req setHTTPShouldHandleCookies:handleCookiesEnabled];
+    
+    __block NSData* response = nil;
+    
+    [NSURLConnection sendAsynchronousRequest:req
+                                       queue:[NSOperationQueue mainQueue]
+                           completionHandler:^(NSURLResponse* resp, NSData* data, NSError* error)
+     {
+         response = data;
+         [expectation fulfill];
+     }];
+    
+    [self waitForExpectationsWithTimeout:kResponseTimeTolerence handler:nil];
+    
+    XCTAssertEqualObjects(response, expectedResponse, @"Unexpected data received");
+}
+
+- (void)test_NilURLAndCookieHandlingEnabled
+{
+    [self _test_NilURLAndCookieHandlingEnabled:YES];
+}
+
+- (void)test_NilURLAndCookieHandlingDisabled
+{
+    [self _test_NilURLAndCookieHandlingEnabled:NO];
+}
+
+@end
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/TimingTests.m b/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/TimingTests.m
new file mode 100644
index 000000000..a805070aa
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/TimingTests.m	
@@ -0,0 +1,162 @@
+/***********************************************************************************
+ *
+ * Copyright (c) 2012 Olivier Halligon
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ ***********************************************************************************/
+
+
+#import <XCTest/XCTest.h>
+#import "OHHTTPStubs.h"
+
+@interface TimingTests : XCTestCase
+{
+    NSMutableData* _data;
+    NSError* _error;
+    XCTestExpectation* _connectionFinishedExpectation;
+    
+//    NSDate* _didReceiveResponseTS;
+    NSDate* _didFinishLoadingTS;
+}
+@end
+
+@implementation TimingTests
+
+-(void)setUp
+{
+    [super setUp];
+
+    _data = [NSMutableData new];
+    _error = nil;
+//    _didReceiveResponseTS = nil;
+    _didFinishLoadingTS = nil;
+    [OHHTTPStubs removeAllStubs];
+}
+-(void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response
+{
+    [_data setLength:0U];
+    // NOTE: This timing info is not reliable as Cocoa always calls the connection:didReceiveResponse: delegate method just before
+    // calling the first "connection:didReceiveData:", even if the [id<NSURLProtocolClient> URLProtocol:didReceiveResponse:…] method was called way before. So we are not testing this
+//    _didReceiveResponseTS = [NSDate date];
+}
+
+-(void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data
+{
+    [_data appendData:data];
+}
+
+-(void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error
+{
+    _error = error; // keep strong reference
+    _didFinishLoadingTS = [NSDate date];
+    [_connectionFinishedExpectation fulfill];
+}
+
+-(void)connectionDidFinishLoading:(NSURLConnection *)connection
+{
+    _didFinishLoadingTS = [NSDate date];
+    [_connectionFinishedExpectation fulfill];
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+static NSTimeInterval const kResponseTimeTolerence = 0.8;
+static NSTimeInterval const kSecurityTimeout = 5.0;
+
+-(void)_testWithData:(NSData*)stubData requestTime:(NSTimeInterval)requestTime responseTime:(NSTimeInterval)responseTime
+{
+    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+        return YES;
+    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+        return [[OHHTTPStubsResponse responseWithData:stubData
+                                           statusCode:200
+                                              headers:nil]
+                requestTime:requestTime responseTime:responseTime];
+    }];
+    
+    _connectionFinishedExpectation = [self expectationWithDescription:@"NSURLConnection did finish (with error or success)"];
+    
+    NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.iana.org/domains/example/"]];
+    NSDate* startTS = [NSDate date];
+    
+    [NSURLConnection connectionWithRequest:req delegate:self];
+    
+    [self waitForExpectationsWithTimeout:requestTime+responseTime+kResponseTimeTolerence+kSecurityTimeout handler:nil];
+
+    XCTAssertEqualObjects(_data, stubData, @"Invalid data response");
+
+//    XCTAssertEqualWithAccuracy([_didReceiveResponseTS timeIntervalSinceDate:startTS], requestTime,
+//                               kResponseTimeTolerence, @"Invalid request time");
+    XCTAssertEqualWithAccuracy([_didFinishLoadingTS timeIntervalSinceDate:startTS], requestTime + responseTime,
+                               kResponseTimeTolerence, @"Invalid response time");
+    
+    [NSThread sleepForTimeInterval:0.01]; // Time for the test to wrap it all (otherwise we may have "Test did not finish" warning)
+}
+
+
+
+
+
+
+-(void)test_RequestTime0_ResponseTime0
+{
+    NSData* testData = [NSStringFromSelector(_cmd) dataUsingEncoding:NSUTF8StringEncoding];
+    [self _testWithData:testData requestTime:0 responseTime:0];
+}
+
+-(void)test_SmallDataLargeTime_CumulativeAlgorithm
+{
+    NSData* testData = [NSStringFromSelector(_cmd) dataUsingEncoding:NSUTF8StringEncoding];
+    // 21 bytes in 23/4 of a second = 0.913042 byte per slot: we need to check that the cumulative algorithm works
+    [self _testWithData:testData requestTime:0 responseTime:5.75];
+}
+
+-(void)test_RequestTime1_ResponseTime0
+{
+    NSData* testData = [NSStringFromSelector(_cmd) dataUsingEncoding:NSUTF8StringEncoding];
+    [self _testWithData:testData requestTime:1 responseTime:0];
+}
+
+-(void)test_LongData_RequestTime1_ResponseTime5
+{
+    static NSUInteger const kDataLength = 1024;
+    NSMutableData* testData = [NSMutableData dataWithCapacity:kDataLength];
+    NSData* chunk = [[NSProcessInfo.processInfo globallyUniqueString] dataUsingEncoding:NSUTF8StringEncoding];
+    while(testData.length<kDataLength)
+    {
+        [testData appendData:chunk];
+    }
+    [self _testWithData:testData requestTime:1 responseTime:5];
+}
+
+-(void)test_VeryLongData_RequestTime1_ResponseTime0
+{
+    static NSUInteger const kDataLength = 609792;
+    NSMutableData* testData = [NSMutableData dataWithCapacity:kDataLength];
+    NSData* chunk = [[NSProcessInfo.processInfo globallyUniqueString] dataUsingEncoding:NSUTF8StringEncoding];
+    while(testData.length<kDataLength)
+    {
+        [testData appendData:chunk];
+    }
+    [self _testWithData:testData requestTime:1 responseTime:0];
+}
+
+@end
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/WithContentsOfURLTests.m b/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/WithContentsOfURLTests.m
new file mode 100644
index 000000000..f68c3d3cd
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/WithContentsOfURLTests.m	
@@ -0,0 +1,116 @@
+/***********************************************************************************
+ *
+ * Copyright (c) 2012 Olivier Halligon
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ ***********************************************************************************/
+
+
+#import <XCTest/XCTest.h>
+#import "OHHTTPStubs.h"
+
+@interface WithContentsOfURLTests : XCTestCase @end
+
+static const NSTimeInterval kResponseTimeTolerence = 0.2;
+
+@implementation WithContentsOfURLTests
+
+-(void)setUp
+{
+    [super setUp];
+    [OHHTTPStubs removeAllStubs];
+}
+
+static const NSTimeInterval kRequestTime = 0.1;
+static const NSTimeInterval kResponseTime = 0.5;
+
+///////////////////////////////////////////////////////////////////////////////////
+#pragma mark [NSString stringWithContentsOfURL:encoding:error:]
+///////////////////////////////////////////////////////////////////////////////////
+
+-(void)test_NSString_stringWithContentsOfURL_mainQueue
+{
+    NSString* testString = NSStringFromSelector(_cmd);
+    
+    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+        return YES;
+    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+        return [[OHHTTPStubsResponse responseWithData:[testString dataUsingEncoding:NSUTF8StringEncoding]
+                                           statusCode:200
+                                              headers:nil]
+                requestTime:kRequestTime responseTime:kResponseTime];
+    }];
+    
+    NSDate* startDate = [NSDate date];
+    
+    NSString* string = [NSString stringWithContentsOfURL:[NSURL URLWithString:@"http://www.iana.org/domains/example/"]
+                                            encoding:NSUTF8StringEncoding
+                                               error:NULL];
+    
+    XCTAssertEqualObjects(string, testString, @"Invalid returned string");
+    XCTAssertEqualWithAccuracy(-[startDate timeIntervalSinceNow], kResponseTime+kRequestTime, kResponseTimeTolerence, @"Invalid response time");
+}
+
+-(void)test_NSString_stringWithContentsOfURL_parallelQueue
+{
+    XCTestExpectation* expectation = [self expectationWithDescription:@"Synchronous download finished"];
+    [[NSOperationQueue new] addOperationWithBlock:^{
+        [self test_NSString_stringWithContentsOfURL_mainQueue];
+        [expectation fulfill];
+    }];
+    [self waitForExpectationsWithTimeout:kRequestTime+kResponseTime+kResponseTimeTolerence handler:nil];
+}
+
+///////////////////////////////////////////////////////////////////////////////////
+#pragma mark [NSData dataWithContentsOfURL:]
+///////////////////////////////////////////////////////////////////////////////////
+
+-(void)test_NSData_dataWithContentsOfURL_mainQueue
+{
+    NSData* testData = [NSStringFromSelector(_cmd) dataUsingEncoding:NSUTF8StringEncoding];
+    
+    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+        return YES;
+    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+        return [[OHHTTPStubsResponse responseWithData:testData
+                                           statusCode:200
+                                              headers:nil]
+                requestTime:kRequestTime responseTime:kResponseTime];
+    }];
+    
+    NSDate* startDate = [NSDate date];
+    
+    NSData* data = [NSData dataWithContentsOfURL:[NSURL URLWithString:@"http://www.iana.org/domains/example/"]];
+    
+    XCTAssertEqualObjects(data, testData, @"Invalid returned string");
+    XCTAssertEqualWithAccuracy(-[startDate timeIntervalSinceNow], kRequestTime+kResponseTime, kResponseTimeTolerence, @"Invalid response time");
+}
+
+-(void)test_NSData_dataWithContentsOfURL_parallelQueue
+{
+    XCTestExpectation* expectation = [self expectationWithDescription:@"Synchronous download finished"];
+    [[NSOperationQueue new] addOperationWithBlock:^{
+        [self test_NSData_dataWithContentsOfURL_mainQueue];
+        [expectation fulfill];
+    }];
+    [self waitForExpectationsWithTimeout:kRequestTime+kResponseTime+kResponseTimeTolerence handler:nil];
+}
+
+@end
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/UnitTests-Info.plist b/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/UnitTests-Info.plist
new file mode 100644
index 000000000..e2305ec01
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/UnitTests-Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.alisoftware.${PRODUCT_NAME:rfc1034identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/UnitTests-Prefix.pch b/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/UnitTests-Prefix.pch
new file mode 100644
index 000000000..a0a31a66c
--- /dev/null
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/UnitTests-Prefix.pch
@@ -0,0 +1,7 @@
+//
+// Prefix header for all source files of the 'OHHTTPStubs Unit Tests' target in the 'OHHTTPStubs Unit Tests' project
+//
+
+#ifdef __OBJC__
+    #import <Foundation/Foundation.h>
+#endif
diff --git a/test/ios/OHHTTPStubs/README.md b/test/ios/OHHTTPStubs/README.md
new file mode 100644
index 000000000..dafd89fa5
--- /dev/null
+++ b/test/ios/OHHTTPStubs/README.md
@@ -0,0 +1,113 @@
+OHHTTPStubs
+===========
+
+[![Platform](http://cocoapod-badges.herokuapp.com/p/OHHTTPStubs/badge.png)](http://cocoadocs.org/docsets/OHHTTPStubs)
+[![Version](http://cocoapod-badges.herokuapp.com/v/OHHTTPStubs/badge.png)](http://cocoadocs.org/docsets/OHHTTPStubs)
+[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
+[![Build Status](https://travis-ci.org/AliSoftware/OHHTTPStubs.png?branch=master)](https://travis-ci.org/AliSoftware/OHHTTPStubs)
+
+`OHHTTPStubs` is a library designed to stub your network requests very easily. It can help you:
+
+* test your apps with **fake network data** (stubbed from file) and **simulate slow networks**, to check your application behavior in bad network conditions
+* write **Unit Tests** that use fake network data from your fixtures.
+
+It works with `NSURLConnection`, new iOS7/OSX.9's `NSURLSession`, `AFNetworking` (both 1.x and 2.x), or any networking framework that use Cocoa's URL Loading System.
+
+[![Donate](http://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=TRTU3UEWEHV92 "Donate")
+
+----
+
+# Documentation & Usage Examples
+
+`OHHTTPStubs` headers are fully documented using Appledoc-like / Headerdoc-like comments in the header files. You can also [read the **online documentation** here](http://cocoadocs.org/docsets/OHHTTPStubs)
+[![Version](http://cocoapod-badges.herokuapp.com/v/OHHTTPStubs/badge.png)](http://cocoadocs.org/docsets/OHHTTPStubs)
+
+
+## Basic example
+
+### In Objective-C
+
+```objc
+[OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+  return [request.URL.host isEqualToString:@"mywebservice.com"];
+} withStubResponse:^OHHTTPStubsResponse*(NSURLRequest *request) {
+  // Stub it with our "wsresponse.json" stub file (which is in same bundle as self)
+  NSString* fixture = OHPathForFile(@"wsresponse.json", self.class);
+  return [OHHTTPStubsResponse responseWithFileAtPath:fixture
+            statusCode:200 headers:@{@"Content-Type":@"application/json"}];
+}];
+```
+
+### In Swift
+
+```swift
+OHHTTPStubs.stubRequestsPassingTest({$0.URL!.host == "mywebservice.com"}) { _ in
+  // Stub it with our "wsresponse.json" stub file (which is in same bundle as self)
+  let fixture = OHPathForFile("wsresponse.json", self.dynamicType)
+  return OHHTTPStubsResponse(fileAtPath: fixture!,
+    statusCode: 200, headers: ["Content-Type":"application/json"])
+}
+```
+
+## More examples & Help Topics
+    
+* For a lot more examples, see the dedicated "[Usage Examples](https://github.com/AliSoftware/OHHTTPStubs/wiki/Usage-Examples)" wiki page.
+* The wiki also contain [some articles that can help you get started](https://github.com/AliSoftware/OHHTTPStubs/wiki) with (and troubleshoot if needed) `OHHTTPStubs`.
+
+# Compatibility
+
+`OHHTTPStubs` is compatible with **iOS 5.0+** and **OSX 10.7+**.
+
+`OHHTTPStubs` also works with iOS7's and OSX 10.9's `NSURLSession` mechanism.
+
+`OHHTTPStubs` is fully **Swift-compatible**. [Nullability annotations](https://developer.apple.com/swift/blog/?id=25) have been added to allow a cleaner API when used from Swift.
+
+# Installing in your projects
+
+Using [CocoaPods](https://guides.cocoapods.org) is the recommended way.
+Simply add `pod 'OHHTTPStubs'` to your `Podfile`.
+
+_`OHHTTPStubs` should also be compatible with Carthage — but I won't guarantee help/support for it as I don't use it personally._
+
+# Special Considerations
+
+## Using OHHTTPStubs in your Unit Tests
+
+`OHHTTPStubs` is ideal to write Unit Tests that normally would perform network requests. But if you use it in your Unit Tests, don't forget to:
+
+* remove any stubs you installed after each test — to avoid those stubs to still be installed when executing the next Test Case — by calling `[OHHTTPStubs removeAllStubs]` in your `tearDown` method. [see this wiki page for more info](https://github.com/AliSoftware/OHHTTPStubs/wiki/Remove-stubs-after-each-test)
+* be sure to wait until the request has received its response before doing your assertions and letting the test case finish (like for any asynchronous test). [see this wiki page for more info](https://github.com/AliSoftware/OHHTTPStubs/wiki/OHHTTPStubs-and-asynchronous-tests)
+
+## Automatic loading
+
+Thanks to method swizzling, `OHHTTPStubs` is automatically loaded and installed both for:
+
+* requests made using `NSURLConnection` or `[NSURLSession sharedSession]`;
+* requests made using a `NSURLSession` created using a `[NSURLSessionConfiguration defaultSessionConfiguration]` or `[NSURLSessionConfiguration ephemeralSessionConfiguration]` configuration (using `[NSURLSession sessionWithConfiguration:…]`-like methods).
+
+If you need to disable (and re-enable) `OHHTTPStubs` — globally or per `NSURLSession` — you can use `[OHHTTPStubs setEnabled:]` / `[OHHTTPStubs setEnabled:forSessionConfiguration:]`.
+
+## Known limitations
+
+* `OHHTTPStubs` **can't work on background sessions** (sessions created using `[NSURLSessionConfiguration backgroundSessionConfiguration]`) because background sessions don't allow the use of custom `NSURLProtocols` and are handled by the iOS Operating System itself.
+* `OHHTTPStubs` don't simulate data upload. The `NSURLProtocolClient` `@protocol` does not provide a way to signal the delegate that data has been **sent** (only that some has been loaded), so any data in the `HTTPBody` or `HTTPBodyStream` of an `NSURLRequest`, or data provided to `-[NSURLSession uploadTaskWithRequest:fromData:];` will be ignored, and more importantly, the `-URLSession:task:didSendBodyData:totalBytesSent:totalBytesExpectedToSend:` delegate method will never be called when you stub the request using `OHHTTPStubs`.
+
+_As far as I know, there's nothing we can do about those two limitations. Please let me know if you know a solution that would make that possible anyway._
+
+
+## Submitting to the AppStore
+
+`OHHTTPStubs` **can be used** on apps subbmiting **on the AppStore**. It does not use any private API and nothing prevents you from shipping it.
+
+But you generally only use stubs during the development phase and want to remove your stubs when submitting to the AppStore. So be careful to only include `OHHTTPStubs` when needed (only in your test targets, or only inside `#if DEBUG` portions, or by using [per-Build-Configuration pods](https://guides.cocoapods.org/syntax/podfile.html#pod)) to avoid forgetting to remove it when the time comes that you release for the AppStore and you want your requests to hit the net!
+
+
+
+# License and Credits
+
+This project and library has been created by Olivier Halligon (@aligatr on Twitter) and is under the MIT License.
+
+It has been inspired by [this article from InfiniteLoop.dk](http://www.infinite-loop.dk/blog/2011/09/using-nsurlprotocol-for-injecting-test-data/).
+I would also like to thank to @kcharwood for its contribution, and everyone who contributed to this project on GitHub.
+
+If you want to support the development of this library, feel free to [![Donate](http://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=TRTU3UEWEHV92 "Donate"). Thanks to all contributors so far!
diff --git a/test/ios/OHHTTPStubs/Rakefile b/test/ios/OHHTTPStubs/Rakefile
new file mode 100644
index 000000000..094945cdc
--- /dev/null
+++ b/test/ios/OHHTTPStubs/Rakefile
@@ -0,0 +1,55 @@
+# Build & test OHHTTPStubs lib from the CLI
+
+desc 'Build an iOS scheme'
+task :ios, [:scheme, :ios_version, :action] do |_,args|
+  destination = "platform=iOS Simulator,name=iPhone 5,OS=#{args.ios_version}"
+  build("OHHTTPStubs #{args.scheme}", "iphonesimulator", destination, args.action)
+end
+
+desc 'Build an OSX scheme'
+task :osx, [:scheme, :arch, :action] do |_,args|
+  destination = "platform=OS X,arch=#{args.arch}"
+  build("OHHTTPStubs #{args.scheme}", "macosx", destination, args.action)
+end
+
+desc 'List installed simulators'
+task :simlist do
+  sh 'xcrun simctl list'
+end
+
+desc 'Run all travis env tasks locally'
+task :travis do
+  require 'YAML'
+  travis = YAML.load_file('.travis.yml')
+  travis['env'].each do |env|
+    arg = env.split('=')[1]
+    puts "\n" + ('-'*80) + "\n\n"
+    sh "rake #{arg}"
+  end
+end
+
+
+# Build the xcodebuild command and run it
+def build(scheme, sdk, destination, action)
+  puts <<-ANNOUNCE
+  =============================
+  | Action: #{action} 
+  | Scheme: "#{scheme}"
+  | #{destination}
+  =============================
+
+  ANNOUNCE
+
+  cmd  = %W(
+    xcodebuild
+    -workspace OHHTTPStubs/OHHTTPStubs.xcworkspace
+    -scheme "#{scheme}"
+    -sdk #{sdk}
+    -configuration Release
+    ONLY_ACTIVE_ARCH=NO
+    -destination '#{destination}'
+    #{action}
+  )
+
+  sh "set -o pipefail && #{cmd.join(' ')} | xcpretty -c"
+end
diff --git a/test/ios/ios-tests.xcodeproj/project.pbxproj b/test/ios/ios-tests.xcodeproj/project.pbxproj
index f644d912d..4f31a5b4a 100644
--- a/test/ios/ios-tests.xcodeproj/project.pbxproj
+++ b/test/ios/ios-tests.xcodeproj/project.pbxproj
@@ -14,6 +14,14 @@
 		DD0581041ACB661200B112C9 /* Headers in Resources */ = {isa = PBXBuildFile; fileRef = DD0581031ACB661200B112C9 /* Headers */; };
 		DD0581061ACB661C00B112C9 /* MapboxGL.bundle in Resources */ = {isa = PBXBuildFile; fileRef = DD0581051ACB661C00B112C9 /* MapboxGL.bundle */; };
 		DD0581081ACB663200B112C9 /* libMapboxGL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DD0581071ACB663200B112C9 /* libMapboxGL.a */; };
+		DD0E6F671B01806600DC035A /* MetricsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DD0E6F661B01806600DC035A /* MetricsTests.m */; };
+		DD0E6F841B0190E200DC035A /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DD0E6F701B0190E200DC035A /* libOCMock.a */; };
+		DD0E6F981B01B68E00DC035A /* OHHTTPStubs.m in Sources */ = {isa = PBXBuildFile; fileRef = DD0E6F8E1B01B68E00DC035A /* OHHTTPStubs.m */; };
+		DD0E6F991B01B68E00DC035A /* OHHTTPStubs+NSURLSessionConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = DD0E6F8F1B01B68E00DC035A /* OHHTTPStubs+NSURLSessionConfiguration.m */; };
+		DD0E6F9A1B01B68E00DC035A /* OHHTTPStubsResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = DD0E6F911B01B68E00DC035A /* OHHTTPStubsResponse.m */; };
+		DD0E6F9B1B01B68E00DC035A /* OHHTTPStubsResponse+HTTPMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = DD0E6F931B01B68E00DC035A /* OHHTTPStubsResponse+HTTPMessage.m */; };
+		DD0E6F9C1B01B68E00DC035A /* OHHTTPStubsResponse+JSON.m in Sources */ = {isa = PBXBuildFile; fileRef = DD0E6F951B01B68E00DC035A /* OHHTTPStubsResponse+JSON.m */; };
+		DD0E6F9D1B01B68E00DC035A /* OHPathHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = DD0E6F971B01B68E00DC035A /* OHPathHelpers.m */; };
 		DD41CE091ACB5DBC00FA7979 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD41CE081ACB5DBC00FA7979 /* CoreTelephony.framework */; };
 		DD41CE0B1ACB5DC400FA7979 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD41CE0A1ACB5DC400FA7979 /* SystemConfiguration.framework */; };
 		DD41CE0D1ACB5DCB00FA7979 /* libc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DD41CE0C1ACB5DCB00FA7979 /* libc++.dylib */; };
@@ -73,6 +81,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		DACAD7111B08719F009119DC /* MGLMapboxEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MGLMapboxEvents.h; path = ../../platform/ios/MGLMapboxEvents.h; sourceTree = SOURCE_ROOT; };
 		DD043323196DB9BC00E6F39D /* Mapbox GL Tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Mapbox GL Tests.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		DD04335F196DBBD500E6F39D /* MGLTAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLTAppDelegate.m; sourceTree = SOURCE_ROOT; };
 		DD043360196DBBD500E6F39D /* MGLTViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLTViewController.m; sourceTree = SOURCE_ROOT; };
@@ -85,6 +94,28 @@
 		DD0581031ACB661200B112C9 /* Headers */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Headers; path = ../../build/ios/pkg/static/Headers; sourceTree = SOURCE_ROOT; };
 		DD0581051ACB661C00B112C9 /* MapboxGL.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = MapboxGL.bundle; path = ../../build/ios/pkg/static/MapboxGL.bundle; sourceTree = SOURCE_ROOT; };
 		DD0581071ACB663200B112C9 /* libMapboxGL.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libMapboxGL.a; path = ../../build/ios/pkg/static/libMapboxGL.a; sourceTree = SOURCE_ROOT; };
+		DD0E6F661B01806600DC035A /* MetricsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MetricsTests.m; sourceTree = SOURCE_ROOT; };
+		DD0E6F701B0190E200DC035A /* libOCMock.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libOCMock.a; path = OCMock/libOCMock.a; sourceTree = SOURCE_ROOT; };
+		DD0E6F721B0190E200DC035A /* NSNotificationCenter+OCMAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSNotificationCenter+OCMAdditions.h"; sourceTree = "<group>"; };
+		DD0E6F731B0190E200DC035A /* OCMArg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMArg.h; sourceTree = "<group>"; };
+		DD0E6F741B0190E200DC035A /* OCMConstraint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMConstraint.h; sourceTree = "<group>"; };
+		DD0E6F751B0190E200DC035A /* OCMLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMLocation.h; sourceTree = "<group>"; };
+		DD0E6F761B0190E200DC035A /* OCMMacroState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMMacroState.h; sourceTree = "<group>"; };
+		DD0E6F771B0190E200DC035A /* OCMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMock.h; sourceTree = "<group>"; };
+		DD0E6F781B0190E200DC035A /* OCMockObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMockObject.h; sourceTree = "<group>"; };
+		DD0E6F791B0190E200DC035A /* OCMRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMRecorder.h; sourceTree = "<group>"; };
+		DD0E6F7A1B0190E200DC035A /* OCMStubRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMStubRecorder.h; sourceTree = "<group>"; };
+		DD0E6F8D1B01B68E00DC035A /* OHHTTPStubs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OHHTTPStubs.h; path = OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs.h; sourceTree = SOURCE_ROOT; };
+		DD0E6F8E1B01B68E00DC035A /* OHHTTPStubs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OHHTTPStubs.m; path = OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs.m; sourceTree = SOURCE_ROOT; };
+		DD0E6F8F1B01B68E00DC035A /* OHHTTPStubs+NSURLSessionConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "OHHTTPStubs+NSURLSessionConfiguration.m"; path = "OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs+NSURLSessionConfiguration.m"; sourceTree = SOURCE_ROOT; };
+		DD0E6F901B01B68E00DC035A /* OHHTTPStubsResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OHHTTPStubsResponse.h; path = OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse.h; sourceTree = SOURCE_ROOT; };
+		DD0E6F911B01B68E00DC035A /* OHHTTPStubsResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OHHTTPStubsResponse.m; path = OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse.m; sourceTree = SOURCE_ROOT; };
+		DD0E6F921B01B68E00DC035A /* OHHTTPStubsResponse+HTTPMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "OHHTTPStubsResponse+HTTPMessage.h"; path = "OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+HTTPMessage.h"; sourceTree = SOURCE_ROOT; };
+		DD0E6F931B01B68E00DC035A /* OHHTTPStubsResponse+HTTPMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "OHHTTPStubsResponse+HTTPMessage.m"; path = "OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+HTTPMessage.m"; sourceTree = SOURCE_ROOT; };
+		DD0E6F941B01B68E00DC035A /* OHHTTPStubsResponse+JSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "OHHTTPStubsResponse+JSON.h"; path = "OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+JSON.h"; sourceTree = SOURCE_ROOT; };
+		DD0E6F951B01B68E00DC035A /* OHHTTPStubsResponse+JSON.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "OHHTTPStubsResponse+JSON.m"; path = "OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+JSON.m"; sourceTree = SOURCE_ROOT; };
+		DD0E6F961B01B68E00DC035A /* OHPathHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OHPathHelpers.h; path = OHHTTPStubs/OHHTTPStubs/Sources/OHPathHelpers.h; sourceTree = SOURCE_ROOT; };
+		DD0E6F971B01B68E00DC035A /* OHPathHelpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OHPathHelpers.m; path = OHHTTPStubs/OHHTTPStubs/Sources/OHPathHelpers.m; sourceTree = SOURCE_ROOT; };
 		DD41CE061ACB5DB300FA7979 /* libMapboxGL.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libMapboxGL.a; path = ../../build/ios/pkg/static/libMapboxGL.a; sourceTree = "<group>"; };
 		DD41CE081ACB5DBC00FA7979 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
 		DD41CE0A1ACB5DC400FA7979 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
@@ -125,6 +156,7 @@
 			files = (
 				DD0580E81ACB628200B112C9 /* IOKit.framework in Frameworks */,
 				DDBD016E196DC4A10033959E /* libKIF.a in Frameworks */,
+				DD0E6F841B0190E200DC035A /* libOCMock.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -191,10 +223,55 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
+		DD0E6F6B1B01906600DC035A /* OCMock */ = {
+			isa = PBXGroup;
+			children = (
+				DD0E6F701B0190E200DC035A /* libOCMock.a */,
+				DD0E6F711B0190E200DC035A /* OCMock */,
+			);
+			name = OCMock;
+			sourceTree = "<group>";
+		};
+		DD0E6F711B0190E200DC035A /* OCMock */ = {
+			isa = PBXGroup;
+			children = (
+				DD0E6F721B0190E200DC035A /* NSNotificationCenter+OCMAdditions.h */,
+				DD0E6F731B0190E200DC035A /* OCMArg.h */,
+				DD0E6F741B0190E200DC035A /* OCMConstraint.h */,
+				DD0E6F751B0190E200DC035A /* OCMLocation.h */,
+				DD0E6F761B0190E200DC035A /* OCMMacroState.h */,
+				DD0E6F771B0190E200DC035A /* OCMock.h */,
+				DD0E6F781B0190E200DC035A /* OCMockObject.h */,
+				DD0E6F791B0190E200DC035A /* OCMRecorder.h */,
+				DD0E6F7A1B0190E200DC035A /* OCMStubRecorder.h */,
+			);
+			name = OCMock;
+			path = OCMock/OCMock;
+			sourceTree = SOURCE_ROOT;
+		};
+		DD0E6F861B01B67100DC035A /* OHHTTPStubs */ = {
+			isa = PBXGroup;
+			children = (
+				DD0E6F8D1B01B68E00DC035A /* OHHTTPStubs.h */,
+				DD0E6F8E1B01B68E00DC035A /* OHHTTPStubs.m */,
+				DD0E6F8F1B01B68E00DC035A /* OHHTTPStubs+NSURLSessionConfiguration.m */,
+				DD0E6F901B01B68E00DC035A /* OHHTTPStubsResponse.h */,
+				DD0E6F911B01B68E00DC035A /* OHHTTPStubsResponse.m */,
+				DD0E6F921B01B68E00DC035A /* OHHTTPStubsResponse+HTTPMessage.h */,
+				DD0E6F931B01B68E00DC035A /* OHHTTPStubsResponse+HTTPMessage.m */,
+				DD0E6F941B01B68E00DC035A /* OHHTTPStubsResponse+JSON.h */,
+				DD0E6F951B01B68E00DC035A /* OHHTTPStubsResponse+JSON.m */,
+				DD0E6F961B01B68E00DC035A /* OHPathHelpers.h */,
+				DD0E6F971B01B68E00DC035A /* OHPathHelpers.m */,
+			);
+			name = OHHTTPStubs;
+			sourceTree = "<group>";
+		};
 		DDAE739B1ACB557500E1A793 /* GL Library */ = {
 			isa = PBXGroup;
 			children = (
 				DD0581031ACB661200B112C9 /* Headers */,
+				DACAD7111B08719F009119DC /* MGLMapboxEvents.h */,
 				DD0581071ACB663200B112C9 /* libMapboxGL.a */,
 				DD0581051ACB661C00B112C9 /* MapboxGL.bundle */,
 			);
@@ -207,8 +284,11 @@
 				DDBD016B196DC4740033959E /* KIFTestActor+MapboxGL.h */,
 				DDBD016A196DC4740033959E /* KIFTestActor+MapboxGL.m */,
 				DDBD0168196DC4740033959E /* MapViewTests.m */,
+				DD0E6F661B01806600DC035A /* MetricsTests.m */,
 				DDBD0167196DC46B0033959E /* Supporting Files */,
 				DDBD014D196DC3B00033959E /* KIF */,
+				DD0E6F6B1B01906600DC035A /* OCMock */,
+				DD0E6F861B01B67100DC035A /* OHHTTPStubs */,
 			);
 			name = Tests;
 			path = "Mapbox GL Tests";
@@ -392,8 +472,15 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				DD0E6F981B01B68E00DC035A /* OHHTTPStubs.m in Sources */,
+				DD0E6F9C1B01B68E00DC035A /* OHHTTPStubsResponse+JSON.m in Sources */,
+				DD0E6F9B1B01B68E00DC035A /* OHHTTPStubsResponse+HTTPMessage.m in Sources */,
 				DDBD016D196DC4740033959E /* KIFTestActor+MapboxGL.m in Sources */,
+				DD0E6F991B01B68E00DC035A /* OHHTTPStubs+NSURLSessionConfiguration.m in Sources */,
+				DD0E6F9A1B01B68E00DC035A /* OHHTTPStubsResponse.m in Sources */,
+				DD0E6F671B01806600DC035A /* MetricsTests.m in Sources */,
 				DDBD016C196DC4740033959E /* MapViewTests.m in Sources */,
+				DD0E6F9D1B01B68E00DC035A /* OHPathHelpers.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -545,8 +632,14 @@
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"../../build/ios/pkg/static/**",
+					OCMock,
+					OHHTTPStubs/OHHTTPStubs/Sources,
 				);
 				INFOPLIST_FILE = "Bundle-Info.plist";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/OCMock",
+				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-framework",
@@ -574,8 +667,14 @@
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"../../build/ios/pkg/static/**",
+					OCMock,
+					OHHTTPStubs/OHHTTPStubs/Sources,
 				);
 				INFOPLIST_FILE = "Bundle-Info.plist";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/OCMock",
+				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-framework",
diff --git a/test/ios/ios-tests.xcodeproj/project.xcworkspace/xcshareddata/ios-tests.xccheckout b/test/ios/ios-tests.xcodeproj/project.xcworkspace/xcshareddata/ios-tests.xccheckout
index e2f98de8f..b6ff646f1 100644
--- a/test/ios/ios-tests.xcodeproj/project.xcworkspace/xcshareddata/ios-tests.xccheckout
+++ b/test/ios/ios-tests.xcodeproj/project.xcworkspace/xcshareddata/ios-tests.xccheckout
@@ -12,6 +12,8 @@
 	<dict>
 		<key>10265E242415D473A6A613214DB7AC3EE3D43F93</key>
 		<string>https://github.com/mapbox/KIF.git</string>
+		<key>38C2A0D4F62B675E8C16C8BC1437C7753846C8AC</key>
+		<string>https://github.com/AliSoftware/OHHTTPStubs.git</string>
 		<key>7E68CB584078A487C0535CC191D3B7551EEE2095</key>
 		<string>github.com:mapbox/mapbox-gl-native.git</string>
 	</dict>
@@ -21,6 +23,8 @@
 	<dict>
 		<key>10265E242415D473A6A613214DB7AC3EE3D43F93</key>
 		<string>../../../..test/ios/KIF</string>
+		<key>38C2A0D4F62B675E8C16C8BC1437C7753846C8AC</key>
+		<string>../../../../test/ios/OHHTTPStubs/</string>
 		<key>7E68CB584078A487C0535CC191D3B7551EEE2095</key>
 		<string>../../../..</string>
 	</dict>
@@ -48,6 +52,14 @@
 			<key>IDESourceControlWCCName</key>
 			<string>KIF</string>
 		</dict>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>38C2A0D4F62B675E8C16C8BC1437C7753846C8AC</string>
+			<key>IDESourceControlWCCName</key>
+			<string>OHHTTPStubs</string>
+		</dict>
 	</array>
 </dict>
 </plist>
diff --git a/test/miscellaneous/binpack.cpp b/test/miscellaneous/binpack.cpp
new file mode 100644
index 000000000..a597f0a29
--- /dev/null
+++ b/test/miscellaneous/binpack.cpp
@@ -0,0 +1,51 @@
+#include "../fixtures/util.hpp"
+
+#include <mbgl/geometry/binpack.hpp>
+
+#include <iosfwd>
+#include <array>
+
+namespace mbgl {
+template <typename T> ::std::ostream& operator<<(::std::ostream& os, const Rect<T>& t) {
+    return os << "Rect { " << t.x << ", " << t.y << ", " << t.w << ", " << t.h << " }";
+}
+}
+
+TEST(BinPack, Allocating) {
+    mbgl::BinPack<uint16_t> bin(128, 128);
+    std::array<mbgl::Rect<uint16_t>, 4> rects;
+
+    rects[0] = bin.allocate(32, 48);
+    ASSERT_EQ(mbgl::Rect<uint16_t>(0, 0, 32, 48), rects[0]);
+    rects[1] = bin.allocate(8, 17);
+    ASSERT_EQ(mbgl::Rect<uint16_t>(32, 0, 8, 17), rects[1]);
+    rects[2] = bin.allocate(8, 17);
+    ASSERT_EQ(mbgl::Rect<uint16_t>(0, 48, 8, 17), rects[2]);
+
+    bin.release(rects[0]);
+    rects[0] = bin.allocate(32, 24);
+    ASSERT_EQ(mbgl::Rect<uint16_t>(0, 0, 32, 24), rects[0]);
+    rects[3] = bin.allocate(32, 24);
+    ASSERT_EQ(mbgl::Rect<uint16_t>(32, 17, 32, 24), rects[3]);
+}
+
+
+TEST(BinPack, Full) {
+    mbgl::BinPack<uint16_t> bin(128, 128);
+    std::vector<mbgl::Rect<uint16_t>> rects;
+
+    for (int j = 0; j < 3; j++) {
+        for (int i = 0; i < 256; i++) {
+            auto rect = bin.allocate(8, 8);
+            ASSERT_TRUE(rect.hasArea());
+            rects.push_back(rect);
+        }
+
+        ASSERT_FALSE(bin.allocate(8, 8).hasArea());
+
+        for (auto& rect: rects) {
+            bin.release(rect);
+        }
+        rects.clear();
+    }
+}
diff --git a/test/miscellaneous/comparisons.cpp b/test/miscellaneous/comparisons.cpp
index 315416c13..afb3990f8 100644
--- a/test/miscellaneous/comparisons.cpp
+++ b/test/miscellaneous/comparisons.cpp
@@ -72,6 +72,13 @@ TEST(FilterComparison, EqualsType) {
     ASSERT_TRUE(evaluate(f, {{}}, FeatureType::LineString));
 }
 
+TEST(FilterComparison, InType) {
+    FilterExpression f = parse("[\"in\", \"$type\", \"LineString\", \"Polygon\"]");
+    ASSERT_FALSE(evaluate(f, {{}}, FeatureType::Point));
+    ASSERT_TRUE(evaluate(f, {{}}, FeatureType::LineString));
+    ASSERT_TRUE(evaluate(f, {{}}, FeatureType::Polygon));
+}
+
 TEST(FilterComparison, Any) {
     ASSERT_FALSE(evaluate(parse("[\"any\"]"), {{}}));
     ASSERT_TRUE(evaluate(parse("[\"any\", [\"==\", \"foo\", 1]]"),
diff --git a/test/miscellaneous/map.cpp b/test/miscellaneous/map.cpp
new file mode 100644
index 000000000..b8707f390
--- /dev/null
+++ b/test/miscellaneous/map.cpp
@@ -0,0 +1,59 @@
+#include "../fixtures/util.hpp"
+
+#include <mbgl/map/map.hpp>
+#include <mbgl/platform/default/headless_view.hpp>
+#include <mbgl/platform/default/headless_display.hpp>
+#include <mbgl/storage/default_file_source.hpp>
+
+using namespace mbgl;
+
+TEST(Map, PauseResume) {
+    using namespace mbgl;
+
+    auto display = std::make_shared<mbgl::HeadlessDisplay>();
+    HeadlessView view(display);
+    DefaultFileSource fileSource(nullptr);
+
+    Map map(view, fileSource, MapMode::Continuous);
+
+    map.pause();
+    map.resume();
+}
+
+TEST(Map, DoublePause) {
+    using namespace mbgl;
+
+    auto display = std::make_shared<mbgl::HeadlessDisplay>();
+    HeadlessView view(display);
+    DefaultFileSource fileSource(nullptr);
+
+    Map map(view, fileSource, MapMode::Continuous);
+
+    map.pause();
+    map.pause();
+    map.resume();
+}
+
+TEST(Map, ResumeWithoutPause) {
+    using namespace mbgl;
+
+    auto display = std::make_shared<mbgl::HeadlessDisplay>();
+    HeadlessView view(display);
+    DefaultFileSource fileSource(nullptr);
+
+    Map map(view, fileSource, MapMode::Continuous);
+
+    map.resume();
+}
+
+TEST(Map, DestroyPaused) {
+    using namespace mbgl;
+
+    auto display = std::make_shared<mbgl::HeadlessDisplay>();
+    HeadlessView view(display);
+    DefaultFileSource fileSource(nullptr);
+
+    Map map(view, fileSource, MapMode::Continuous);
+
+    map.pause();
+}
diff --git a/test/miscellaneous/map_context.cpp b/test/miscellaneous/map_context.cpp
new file mode 100644
index 000000000..ed5192303
--- /dev/null
+++ b/test/miscellaneous/map_context.cpp
@@ -0,0 +1,22 @@
+#include "../fixtures/util.hpp"
+
+#include <mbgl/map/map_data.hpp>
+#include <mbgl/map/map_context.hpp>
+#include <mbgl/platform/default/headless_view.hpp>
+#include <mbgl/platform/default/headless_display.hpp>
+#include <mbgl/storage/default_file_source.hpp>
+#include <mbgl/util/thread.hpp>
+
+using namespace mbgl;
+
+TEST(MapContext, DoubleStyleLoad) {
+    std::shared_ptr<HeadlessDisplay> display = std::make_shared<HeadlessDisplay>();
+    HeadlessView view(display, 512, 512, 1);
+    DefaultFileSource fileSource(nullptr);
+    MapData data(view, MapMode::Continuous);
+
+    util::Thread<MapContext> context("Map", util::ThreadPriority::Regular, view, fileSource, data);
+
+    context.invokeSync(&MapContext::setStyleJSON, "", "");
+    context.invokeSync(&MapContext::setStyleJSON, "", "");
+}
diff --git a/test/miscellaneous/transform.cpp b/test/miscellaneous/transform.cpp
new file mode 100644
index 000000000..6025cbce4
--- /dev/null
+++ b/test/miscellaneous/transform.cpp
@@ -0,0 +1,125 @@
+#include "../fixtures/util.hpp"
+
+#include <mbgl/util/run_loop.hpp>
+#include <mbgl/map/map_data.hpp>
+#include <mbgl/map/map_context.hpp>
+#include <mbgl/platform/default/headless_view.hpp>
+#include <mbgl/platform/default/headless_display.hpp>
+#include <mbgl/storage/default_file_source.hpp>
+
+#include <cstdlib>
+
+using namespace mbgl;
+
+class MockView : public View {
+public:
+    void activate() override {
+    }
+    void deactivate() override {
+    }
+    void notify() override {
+    }
+    void invalidate(std::function<void()>) override {
+    }
+};
+
+TEST(Transform, InvalidScale) {
+    MockView view;
+    Transform transform(view);
+
+    ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude);
+    ASSERT_DOUBLE_EQ(0, transform.getLatLng().longitude);
+    ASSERT_DOUBLE_EQ(1, transform.getScale());
+
+    transform.setScale(2);
+
+    ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude);
+    ASSERT_DOUBLE_EQ(0, transform.getLatLng().longitude);
+    ASSERT_DOUBLE_EQ(2, transform.getScale());
+
+    const double invalid = std::nan("");
+    transform.setScale(invalid);
+
+    ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude);
+    ASSERT_DOUBLE_EQ(0, transform.getLatLng().longitude);
+    ASSERT_DOUBLE_EQ(2, transform.getScale());
+
+    transform.scaleBy(invalid);
+
+    ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude);
+    ASSERT_DOUBLE_EQ(0, transform.getLatLng().longitude);
+    ASSERT_DOUBLE_EQ(2, transform.getScale());
+
+    transform.setZoom(invalid);
+
+    ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude);
+    ASSERT_DOUBLE_EQ(0, transform.getLatLng().longitude);
+    ASSERT_DOUBLE_EQ(2, transform.getScale());
+
+    transform.setLatLngZoom({ 0, 0 }, invalid);
+
+    ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude);
+    ASSERT_DOUBLE_EQ(0, transform.getLatLng().longitude);
+    ASSERT_DOUBLE_EQ(2, transform.getScale());
+}
+
+TEST(Transform, InvalidLatLng) {
+    MockView view;
+    Transform transform(view);
+
+    ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude);
+    ASSERT_DOUBLE_EQ(0, transform.getLatLng().longitude);
+    ASSERT_DOUBLE_EQ(1, transform.getScale());
+
+    transform.setScale(2);
+    transform.setLatLng({ 8, 10 });
+
+    ASSERT_DOUBLE_EQ(8, transform.getLatLng().latitude);
+    ASSERT_DOUBLE_EQ(10, transform.getLatLng().longitude);
+    ASSERT_DOUBLE_EQ(2, transform.getScale());
+
+    transform.setLatLngZoom({ 10, 8 }, 2);
+
+    ASSERT_DOUBLE_EQ(10, transform.getLatLng().latitude);
+    ASSERT_DOUBLE_EQ(8, transform.getLatLng().longitude);
+    ASSERT_DOUBLE_EQ(4, transform.getScale());
+
+    const double invalid = std::nan("");
+    transform.setLatLngZoom({ invalid, 8 }, 2);
+
+    ASSERT_DOUBLE_EQ(10, transform.getLatLng().latitude);
+    ASSERT_DOUBLE_EQ(8, transform.getLatLng().longitude);
+    ASSERT_DOUBLE_EQ(4, transform.getScale());
+
+    transform.setLatLngZoom({ 10, invalid }, 2);
+
+    ASSERT_DOUBLE_EQ(10, transform.getLatLng().latitude);
+    ASSERT_DOUBLE_EQ(8, transform.getLatLng().longitude);
+    ASSERT_DOUBLE_EQ(4, transform.getScale());
+}
+
+
+TEST(Transform, InvalidBearing) {
+    MockView view;
+    Transform transform(view);
+
+    ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude);
+    ASSERT_DOUBLE_EQ(0, transform.getLatLng().longitude);
+    ASSERT_DOUBLE_EQ(1, transform.getScale());
+
+    transform.setScale(2);
+    transform.setAngle(2);
+
+    ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude);
+    ASSERT_DOUBLE_EQ(0, transform.getLatLng().longitude);
+    ASSERT_DOUBLE_EQ(2, transform.getScale());
+    ASSERT_DOUBLE_EQ(2, transform.getAngle());
+
+    const double invalid = std::nan("");
+    transform.setAngle(invalid);
+
+    ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude);
+    ASSERT_DOUBLE_EQ(0, transform.getLatLng().longitude);
+    ASSERT_DOUBLE_EQ(2, transform.getScale());
+    ASSERT_DOUBLE_EQ(2, transform.getAngle());
+}
diff --git a/test/miscellaneous/worker.cpp b/test/miscellaneous/worker.cpp
new file mode 100644
index 000000000..3d3c781b8
--- /dev/null
+++ b/test/miscellaneous/worker.cpp
@@ -0,0 +1,104 @@
+#include "../fixtures/util.hpp"
+
+#include <mbgl/util/worker.hpp>
+#include <mbgl/util/work_request.hpp>
+#include <mbgl/util/run_loop.hpp>
+
+using namespace mbgl;
+using namespace mbgl::util;
+
+TEST(Worker, ExecutesWorkAndAfter) {
+    RunLoop loop(uv_default_loop());
+
+    Worker worker(1);
+    std::unique_ptr<WorkRequest> request;
+
+    bool didWork = false;
+    bool didAfter = false;
+
+    loop.invoke([&] {
+        request = worker.send([&] {
+            didWork = true;
+        }, [&] {
+            didAfter = true;
+            loop.stop();
+        });
+    });
+
+    uv_run(uv_default_loop(), UV_RUN_DEFAULT);
+    EXPECT_TRUE(didWork);
+    EXPECT_TRUE(didAfter);
+}
+
+TEST(Worker, WorkRequestDeletionWaitsForWorkToComplete) {
+    RunLoop loop(uv_default_loop());
+
+    Worker worker(1);
+    std::promise<void> started;
+    bool didWork = false;
+
+    loop.invoke([&] {
+        auto request = worker.send([&] {
+            started.set_value();
+            usleep(10000);
+            didWork = true;
+        }, [&] {});
+        started.get_future().get();
+
+        request.reset();
+        EXPECT_TRUE(didWork);
+        loop.stop();
+    });
+
+    uv_run(uv_default_loop(), UV_RUN_DEFAULT);
+}
+
+TEST(Worker, WorkRequestJoinCancelsAfter) {
+    RunLoop loop(uv_default_loop());
+
+    Worker worker(1);
+    std::promise<void> started;
+    bool didAfter = false;
+
+    loop.invoke([&] {
+        auto request = worker.send([&] {
+            started.set_value();
+        }, [&] {
+            didAfter = true;
+        });
+        started.get_future().get();
+
+        request.reset();
+        loop.stop();
+    });
+
+    uv_run(uv_default_loop(), UV_RUN_DEFAULT);
+    EXPECT_FALSE(didAfter);
+}
+
+TEST(Worker, WorkRequestCancelsImmediately) {
+    RunLoop loop(uv_default_loop());
+
+    Worker worker(1);
+
+    loop.invoke([&] {
+        std::promise<void> started;
+        // First worker item.
+        auto request1 = worker.send([&] {
+            usleep(10000);
+            started.set_value();
+        }, [&] {});
+
+        auto request2 = worker.send([&] {
+            ADD_FAILURE() << "Second work item should not be invoked";
+        }, [&] {});
+        request2.reset();
+
+        started.get_future().get();
+        request1.reset();
+
+        loop.stop();
+    });
+
+    uv_run(uv_default_loop(), UV_RUN_DEFAULT);
+}
diff --git a/test/storage/cache_response.cpp b/test/storage/cache_response.cpp
index d5dd8b36e..87de62025 100644
--- a/test/storage/cache_response.cpp
+++ b/test/storage/cache_response.cpp
@@ -14,9 +14,8 @@ TEST_F(Storage, CacheResponse) {
     DefaultFileSource fs(&cache);
 
     const Resource resource { Resource::Unknown, "http://127.0.0.1:3000/cache" };
-    auto &env = *static_cast<const Environment *>(nullptr);
 
-    fs.request(resource, uv_default_loop(), env, [&](const Response &res) {
+    fs.request(resource, uv_default_loop(), [&](const Response &res) {
         EXPECT_EQ(Response::Successful, res.status);
         EXPECT_EQ("Response 1", res.data);
         EXPECT_LT(0, res.expires);
@@ -24,7 +23,7 @@ TEST_F(Storage, CacheResponse) {
         EXPECT_EQ("", res.etag);
         EXPECT_EQ("", res.message);
 
-        fs.request(resource, uv_default_loop(), env, [&, res](const Response &res2) {
+        fs.request(resource, uv_default_loop(), [&, res](const Response &res2) {
             EXPECT_EQ(res.status, res2.status);
             EXPECT_EQ(res.data, res2.data);
             EXPECT_EQ(res.expires, res2.expires);
diff --git a/test/storage/cache_revalidate.cpp b/test/storage/cache_revalidate.cpp
index ceb6b2969..1bfd6941b 100644
--- a/test/storage/cache_revalidate.cpp
+++ b/test/storage/cache_revalidate.cpp
@@ -15,10 +15,8 @@ TEST_F(Storage, CacheRevalidate) {
     SQLiteCache cache(":memory:");
     DefaultFileSource fs(&cache);
 
-    auto &env = *static_cast<const Environment *>(nullptr);
-
     const Resource revalidateSame { Resource::Unknown, "http://127.0.0.1:3000/revalidate-same" };
-    fs.request(revalidateSame, uv_default_loop(), env, [&](const Response &res) {
+    fs.request(revalidateSame, uv_default_loop(), [&](const Response &res) {
         EXPECT_EQ(Response::Successful, res.status);
         EXPECT_EQ("Response", res.data);
         EXPECT_EQ(0, res.expires);
@@ -26,7 +24,7 @@ TEST_F(Storage, CacheRevalidate) {
         EXPECT_EQ("snowfall", res.etag);
         EXPECT_EQ("", res.message);
 
-        fs.request(revalidateSame, uv_default_loop(), env, [&, res](const Response &res2) {
+        fs.request(revalidateSame, uv_default_loop(), [&, res](const Response &res2) {
             EXPECT_EQ(Response::Successful, res2.status);
             EXPECT_EQ("Response", res2.data);
             // We use this to indicate that a 304 reply came back.
@@ -42,7 +40,7 @@ TEST_F(Storage, CacheRevalidate) {
 
     const Resource revalidateModified{ Resource::Unknown,
                                        "http://127.0.0.1:3000/revalidate-modified" };
-    fs.request(revalidateModified, uv_default_loop(), env, [&](const Response &res) {
+    fs.request(revalidateModified, uv_default_loop(), [&](const Response &res) {
         EXPECT_EQ(Response::Successful, res.status);
         EXPECT_EQ("Response", res.data);
         EXPECT_EQ(0, res.expires);
@@ -50,7 +48,7 @@ TEST_F(Storage, CacheRevalidate) {
         EXPECT_EQ("", res.etag);
         EXPECT_EQ("", res.message);
 
-        fs.request(revalidateModified, uv_default_loop(), env, [&, res](const Response &res2) {
+        fs.request(revalidateModified, uv_default_loop(), [&, res](const Response &res2) {
             EXPECT_EQ(Response::Successful, res2.status);
             EXPECT_EQ("Response", res2.data);
             // We use this to indicate that a 304 reply came back.
@@ -64,7 +62,7 @@ TEST_F(Storage, CacheRevalidate) {
     });
 
     const Resource revalidateEtag { Resource::Unknown, "http://127.0.0.1:3000/revalidate-etag" };
-    fs.request(revalidateEtag, uv_default_loop(), env, [&](const Response &res) {
+    fs.request(revalidateEtag, uv_default_loop(), [&](const Response &res) {
         EXPECT_EQ(Response::Successful, res.status);
         EXPECT_EQ("Response 1", res.data);
         EXPECT_EQ(0, res.expires);
@@ -72,7 +70,7 @@ TEST_F(Storage, CacheRevalidate) {
         EXPECT_EQ("response-1", res.etag);
         EXPECT_EQ("", res.message);
 
-        fs.request(revalidateEtag, uv_default_loop(), env, [&, res](const Response &res2) {
+        fs.request(revalidateEtag, uv_default_loop(), [&, res](const Response &res2) {
             EXPECT_EQ(Response::Successful, res2.status);
             EXPECT_EQ("Response 2", res2.data);
             EXPECT_EQ(0, res2.expires);
diff --git a/test/storage/database.cpp b/test/storage/database.cpp
index 4a9cc3e16..a44c7ff4b 100644
--- a/test/storage/database.cpp
+++ b/test/storage/database.cpp
@@ -1,11 +1,10 @@
 #include "storage.hpp"
 #include "../fixtures/fixture_log_observer.hpp"
 
-#include <mbgl/storage/sqlite_cache.hpp>
+#include "sqlite_cache_impl.hpp"
 #include <mbgl/storage/resource.hpp>
 #include <mbgl/storage/response.hpp>
 #include <mbgl/util/io.hpp>
-#include <mbgl/util/run_loop.hpp>
 
 #include <sqlite3.h>
 
@@ -14,18 +13,10 @@ TEST_F(Storage, DatabaseDoesNotExist) {
 
     Log::setObserver(util::make_unique<FixtureLogObserver>());
 
-    SQLiteCache cache("test/fixtures/404/cache.db");
+    SQLiteCache::Impl cache(nullptr, "test/fixtures/404/cache.db");
 
-    util::RunLoop loop;
-
-    loop.invoke([&] {
-        cache.get({ Resource::Unknown, "mapbox://test" }, [&] (std::unique_ptr<Response> res) {
-            EXPECT_EQ(nullptr, res.get());
-            loop.stop();
-        });
-    });
-
-    loop.run();
+    std::unique_ptr<Response> res = cache.get({ Resource::Unknown, "mapbox://test" });
+    EXPECT_EQ(nullptr, res.get());
 
     auto observer = Log::removeObserver();
     EXPECT_EQ(1ul, dynamic_cast<FixtureLogObserver*>(observer.get())->count({ EventSeverity::Error, Event::Database, 14, "unable to open database file" }));
@@ -63,18 +54,10 @@ TEST_F(Storage, DatabaseCreate) {
 
     Log::setObserver(util::make_unique<FixtureLogObserver>());
 
-    SQLiteCache cache("test/fixtures/database/cache.db");
+    SQLiteCache::Impl cache(nullptr, "test/fixtures/database/cache.db");
 
-    util::RunLoop loop;
-
-    loop.invoke([&] {
-        cache.get({ Resource::Unknown, "mapbox://test" }, [&] (std::unique_ptr<Response> res) {
-            EXPECT_EQ(nullptr, res.get());
-            loop.stop();
-        });
-    });
-
-    loop.run();
+    std::unique_ptr<Response> res = cache.get({ Resource::Unknown, "mapbox://test" });
+    EXPECT_EQ(nullptr, res.get());
 
     Log::removeObserver();
 }
@@ -126,23 +109,14 @@ TEST_F(Storage, DatabaseLockedRead) {
     deleteFile("test/fixtures/database/locked.db");
     FileLock guard("test/fixtures/database/locked.db");
 
-
-    SQLiteCache cache("test/fixtures/database/locked.db");
+    SQLiteCache::Impl cache(nullptr, "test/fixtures/database/locked.db");
 
     {
         // First request should fail.
         Log::setObserver(util::make_unique<FixtureLogObserver>());
 
-        util::RunLoop loop;
-
-        loop.invoke([&] {
-            cache.get({ Resource::Unknown, "mapbox://test" }, [&] (std::unique_ptr<Response> res) {
-                EXPECT_EQ(nullptr, res.get());
-                loop.stop();
-            });
-        });
-
-        loop.run();
+        std::unique_ptr<Response> res = cache.get({ Resource::Unknown, "mapbox://test" });
+        EXPECT_EQ(nullptr, res.get());
 
         // Make sure that we got a few "database locked" errors
         auto observer = Log::removeObserver();
@@ -157,16 +131,8 @@ TEST_F(Storage, DatabaseLockedRead) {
         // First, try getting a file (the cache value should not exist).
         Log::setObserver(util::make_unique<FixtureLogObserver>());
 
-        util::RunLoop loop;
-
-        loop.invoke([&] {
-            cache.get({ Resource::Unknown, "mapbox://test" }, [&] (std::unique_ptr<Response> res) {
-                EXPECT_EQ(nullptr, res.get());
-                loop.stop();
-            });
-        });
-
-        loop.run();
+        std::unique_ptr<Response> res = cache.get({ Resource::Unknown, "mapbox://test" });
+        EXPECT_EQ(nullptr, res.get());
 
         // Make sure that we got a no errors
         Log::removeObserver();
@@ -183,24 +149,16 @@ TEST_F(Storage, DatabaseLockedWrite) {
     deleteFile("test/fixtures/database/locked.db");
     FileLock guard("test/fixtures/database/locked.db");
 
-    SQLiteCache cache("test/fixtures/database/locked.db");
+    SQLiteCache::Impl cache(nullptr, "test/fixtures/database/locked.db");
 
     {
         // Adds a file (which should fail).
         Log::setObserver(util::make_unique<FixtureLogObserver>());
 
-        util::RunLoop loop;
-
-        loop.invoke([&] {
-            auto response = std::make_shared<Response>();
-            cache.put({ Resource::Unknown, "mapbox://test" }, response, FileCache::Hint::Full);
-            cache.get({ Resource::Unknown, "mapbox://test" }, [&] (std::unique_ptr<Response> res) {
-                EXPECT_EQ(nullptr, res.get());
-                loop.stop();
-            });
-        });
-
-        loop.run();
+        auto response = std::make_shared<Response>();
+        cache.put({ Resource::Unknown, "mapbox://test" }, response);
+        std::unique_ptr<Response> res = cache.get({ Resource::Unknown, "mapbox://test" });
+        EXPECT_EQ(nullptr, res.get());
 
         auto observer = Log::removeObserver();
         auto flo = dynamic_cast<FixtureLogObserver*>(observer.get());
@@ -214,20 +172,12 @@ TEST_F(Storage, DatabaseLockedWrite) {
         // Then, set a file and obtain it again.
         Log::setObserver(util::make_unique<FixtureLogObserver>());
 
-        util::RunLoop loop;
-
-        loop.invoke([&] {
-            auto response = std::make_shared<Response>();
-            response->data = "Demo";
-            cache.put({ Resource::Unknown, "mapbox://test" }, response, FileCache::Hint::Full);
-            cache.get({ Resource::Unknown, "mapbox://test" }, [&] (std::unique_ptr<Response> res) {
-                EXPECT_NE(nullptr, res.get());
-                EXPECT_EQ("Demo", res->data);
-                loop.stop();
-            });
-        });
-
-        loop.run();
+        auto response = std::make_shared<Response>();
+        response->data = "Demo";
+        cache.put({ Resource::Unknown, "mapbox://test" }, response);
+        std::unique_ptr<Response> res = cache.get({ Resource::Unknown, "mapbox://test" });
+        EXPECT_NE(nullptr, res.get());
+        EXPECT_EQ("Demo", res->data);
 
         // Make sure that we got a no errors
         Log::removeObserver();
@@ -244,7 +194,7 @@ TEST_F(Storage, DatabaseLockedRefresh) {
     createDir("test/fixtures/database");
     deleteFile("test/fixtures/database/locked.db");
 
-    SQLiteCache cache("test/fixtures/database/locked.db");
+    SQLiteCache::Impl cache(nullptr, "test/fixtures/database/locked.db");
 
     // Then, lock the file and try again.
     FileLock guard("test/fixtures/database/locked.db");
@@ -253,19 +203,11 @@ TEST_F(Storage, DatabaseLockedRefresh) {
         // Adds a file.
         Log::setObserver(util::make_unique<FixtureLogObserver>());
 
-        util::RunLoop loop;
-
-        loop.invoke([&] {
-            auto response = std::make_shared<Response>();
-            response->data = "Demo";
-            cache.put({ Resource::Unknown, "mapbox://test" }, response, FileCache::Hint::Full);
-            cache.get({ Resource::Unknown, "mapbox://test" }, [&] (std::unique_ptr<Response> res) {
-                EXPECT_EQ(nullptr, res.get());
-                loop.stop();
-            });
-        });
-
-        loop.run();
+        auto response = std::make_shared<Response>();
+        response->data = "Demo";
+        cache.put({ Resource::Unknown, "mapbox://test" }, response);
+        std::unique_ptr<Response> res = cache.get({ Resource::Unknown, "mapbox://test" });
+        EXPECT_EQ(nullptr, res.get());
 
         auto observer = Log::removeObserver();
         auto flo = dynamic_cast<FixtureLogObserver*>(observer.get());
@@ -276,19 +218,11 @@ TEST_F(Storage, DatabaseLockedRefresh) {
         // Then, try to refresh it.
         Log::setObserver(util::make_unique<FixtureLogObserver>());
 
-        util::RunLoop loop;
-
-        loop.invoke([&] {
-            auto response = std::make_shared<Response>();
-            response->data = "Demo";
-            cache.put({ Resource::Unknown, "mapbox://test" }, response, FileCache::Hint::Refresh);
-            cache.get({ Resource::Unknown, "mapbox://test" }, [&] (std::unique_ptr<Response> res) {
-                EXPECT_EQ(nullptr, res.get());
-                loop.stop();
-            });
-        });
-
-        loop.run();
+        auto response = std::make_shared<Response>();
+        response->data = "Demo";
+        cache.refresh({ Resource::Unknown, "mapbox://test" }, response->expires);
+        std::unique_ptr<Response> res = cache.get({ Resource::Unknown, "mapbox://test" });
+        EXPECT_EQ(nullptr, res.get());
 
         // Make sure that we got the right errors.
         auto observer = Log::removeObserver();
@@ -306,26 +240,18 @@ TEST_F(Storage, DatabaseDeleted) {
     createDir("test/fixtures/database");
     deleteFile("test/fixtures/database/locked.db");
 
-    SQLiteCache cache("test/fixtures/database/locked.db");
+    SQLiteCache::Impl cache(nullptr, "test/fixtures/database/locked.db");
 
     {
         // Adds a file.
         Log::setObserver(util::make_unique<FixtureLogObserver>());
 
-        util::RunLoop loop;
-
-        loop.invoke([&] {
-            auto response = std::make_shared<Response>();
-            response->data = "Demo";
-            cache.put({ Resource::Unknown, "mapbox://test" }, response, FileCache::Hint::Full);
-            cache.get({ Resource::Unknown, "mapbox://test" }, [&] (std::unique_ptr<Response> res) {
-                EXPECT_NE(nullptr, res.get());
-                EXPECT_EQ("Demo", res->data);
-                loop.stop();
-            });
-        });
-
-        loop.run();
+        auto response = std::make_shared<Response>();
+        response->data = "Demo";
+        cache.put({ Resource::Unknown, "mapbox://test" }, response);
+        std::unique_ptr<Response> res = cache.get({ Resource::Unknown, "mapbox://test" });
+        EXPECT_NE(nullptr, res.get());
+        EXPECT_EQ("Demo", res->data);
 
         Log::removeObserver();
     }
@@ -336,20 +262,12 @@ TEST_F(Storage, DatabaseDeleted) {
         // Adds a file.
         Log::setObserver(util::make_unique<FixtureLogObserver>());
 
-        util::RunLoop loop;
-
-        loop.invoke([&] {
-            auto response = std::make_shared<Response>();
-            response->data = "Demo";
-            cache.put({ Resource::Unknown, "mapbox://test" }, response, FileCache::Hint::Full);
-            cache.get({ Resource::Unknown, "mapbox://test" }, [&] (std::unique_ptr<Response> res) {
-                EXPECT_NE(nullptr, res.get());
-                EXPECT_EQ("Demo", res->data);
-                loop.stop();
-            });
-        });
-
-        loop.run();
+        auto response = std::make_shared<Response>();
+        response->data = "Demo";
+        cache.put({ Resource::Unknown, "mapbox://test" }, response);
+        std::unique_ptr<Response> res = cache.get({ Resource::Unknown, "mapbox://test" });
+        EXPECT_NE(nullptr, res.get());
+        EXPECT_EQ("Demo", res->data);
 
         auto observer = Log::removeObserver();
         auto flo = dynamic_cast<FixtureLogObserver*>(observer.get());
@@ -367,26 +285,18 @@ TEST_F(Storage, DatabaseInvalid) {
     deleteFile("test/fixtures/database/invalid.db");
     writeFile("test/fixtures/database/invalid.db", "this is an invalid file");
 
-    SQLiteCache cache("test/fixtures/database/invalid.db");
+    SQLiteCache::Impl cache(nullptr, "test/fixtures/database/invalid.db");
 
     {
         // Adds a file.
         Log::setObserver(util::make_unique<FixtureLogObserver>());
 
-        util::RunLoop loop;
-
-        loop.invoke([&] {
-            auto response = std::make_shared<Response>();
-            response->data = "Demo";
-            cache.put({ Resource::Unknown, "mapbox://test" }, response, FileCache::Hint::Full);
-            cache.get({ Resource::Unknown, "mapbox://test" }, [&] (std::unique_ptr<Response> res) {
-                EXPECT_NE(nullptr, res.get());
-                EXPECT_EQ("Demo", res->data);
-                loop.stop();
-            });
-        });
-
-        loop.run();
+        auto response = std::make_shared<Response>();
+        response->data = "Demo";
+        cache.put({ Resource::Unknown, "mapbox://test" }, response);
+        std::unique_ptr<Response> res = cache.get({ Resource::Unknown, "mapbox://test" });
+        EXPECT_NE(nullptr, res.get());
+        EXPECT_EQ("Demo", res->data);
 
         auto observer = Log::removeObserver();
         auto flo = dynamic_cast<FixtureLogObserver*>(observer.get());
diff --git a/test/storage/directory_reading.cpp b/test/storage/directory_reading.cpp
index ccae4177c..4459b42c2 100644
--- a/test/storage/directory_reading.cpp
+++ b/test/storage/directory_reading.cpp
@@ -15,10 +15,8 @@ TEST_F(Storage, AssetReadDirectory) {
     DefaultFileSource fs(nullptr);
 #endif
 
-    auto &env = *static_cast<const Environment *>(nullptr);
-
     fs.request({ Resource::Unknown, "asset://TEST_DATA/fixtures/storage" }, uv_default_loop(),
-               env, [&](const Response &res) {
+               [&](const Response &res) {
         EXPECT_EQ(Response::Error, res.status);
         EXPECT_EQ(0ul, res.data.size());
         EXPECT_EQ(0, res.expires);
@@ -27,7 +25,7 @@ TEST_F(Storage, AssetReadDirectory) {
 #ifdef MBGL_ASSET_ZIP
         EXPECT_EQ("No such file", res.message);
 #elif MBGL_ASSET_FS
-                            EXPECT_EQ("illegal operation on a directory", res.message);
+        EXPECT_EQ("illegal operation on a directory", res.message);
 #endif
         ReadDirectory.finish();
     });
diff --git a/test/storage/file_reading.cpp b/test/storage/file_reading.cpp
index 01db75d5c..8db911f65 100644
--- a/test/storage/file_reading.cpp
+++ b/test/storage/file_reading.cpp
@@ -16,10 +16,8 @@ TEST_F(Storage, AssetEmptyFile) {
     DefaultFileSource fs(nullptr);
 #endif
 
-    auto &env = *static_cast<const Environment *>(nullptr);
-
     fs.request({ Resource::Unknown, "asset://TEST_DATA/fixtures/storage/empty" }, uv_default_loop(),
-               env, [&](const Response &res) {
+               [&](const Response &res) {
         EXPECT_EQ(Response::Successful, res.status);
         EXPECT_EQ(0ul, res.data.size());
         EXPECT_EQ(0, res.expires);
@@ -43,10 +41,8 @@ TEST_F(Storage, AssetNonEmptyFile) {
     DefaultFileSource fs(nullptr);
 #endif
 
-    auto &env = *static_cast<const Environment *>(nullptr);
-
     fs.request({ Resource::Unknown, "asset://TEST_DATA/fixtures/storage/nonempty" },
-               uv_default_loop(), env, [&](const Response &res) {
+               uv_default_loop(), [&](const Response &res) {
         EXPECT_EQ(Response::Successful, res.status);
         EXPECT_EQ(16ul, res.data.size());
         EXPECT_EQ(0, res.expires);
@@ -71,10 +67,8 @@ TEST_F(Storage, AssetNonExistentFile) {
     DefaultFileSource fs(nullptr);
 #endif
 
-    auto &env = *static_cast<const Environment *>(nullptr);
-
     fs.request({ Resource::Unknown, "asset://TEST_DATA/fixtures/storage/does_not_exist" },
-               uv_default_loop(), env, [&](const Response &res) {
+               uv_default_loop(), [&](const Response &res) {
         EXPECT_EQ(Response::Error, res.status);
         EXPECT_EQ(0ul, res.data.size());
         EXPECT_EQ(0, res.expires);
diff --git a/test/storage/http_cancel.cpp b/test/storage/http_cancel.cpp
index 80efb3977..a73182da5 100644
--- a/test/storage/http_cancel.cpp
+++ b/test/storage/http_cancel.cpp
@@ -14,10 +14,8 @@ TEST_F(Storage, HTTPCancel) {
 
     DefaultFileSource fs(nullptr);
 
-    auto &env = *static_cast<const Environment *>(nullptr);
-
     auto req =
-        fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, uv_default_loop(), env,
+        fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, uv_default_loop(),
                    [&](const Response &) { ADD_FAILURE() << "Callback should not be called"; });
 
     fs.cancel(req);
@@ -33,13 +31,12 @@ TEST_F(Storage, HTTPCancelMultiple) {
 
     DefaultFileSource fs(nullptr);
 
-    auto &env = *static_cast<const Environment *>(nullptr);
     const Resource resource { Resource::Unknown, "http://127.0.0.1:3000/test" };
 
-    auto req2 = fs.request(resource, uv_default_loop(), env, [&](const Response &) {
+    auto req2 = fs.request(resource, uv_default_loop(), [&](const Response &) {
         ADD_FAILURE() << "Callback should not be called";
     });
-    fs.request(resource, uv_default_loop(), env, [&](const Response &res) {
+    fs.request(resource, uv_default_loop(), [&](const Response &res) {
         EXPECT_EQ(Response::Successful, res.status);
         EXPECT_EQ("Hello World!", res.data);
         EXPECT_EQ(0, res.expires);
diff --git a/test/storage/http_coalescing.cpp b/test/storage/http_coalescing.cpp
index 28fa4415b..5c90009f8 100644
--- a/test/storage/http_coalescing.cpp
+++ b/test/storage/http_coalescing.cpp
@@ -14,8 +14,6 @@ TEST_F(Storage, HTTPCoalescing) {
 
     DefaultFileSource fs(nullptr);
 
-    auto &env = *static_cast<const Environment *>(nullptr);
-
     static const Response *reference = nullptr;
 
     const auto complete = [&](const Response &res) {
@@ -43,7 +41,7 @@ TEST_F(Storage, HTTPCoalescing) {
     const Resource resource { Resource::Unknown, "http://127.0.0.1:3000/test" };
 
     for (int i = 0; i < total; i++) {
-        fs.request(resource, uv_default_loop(), env, complete);
+        fs.request(resource, uv_default_loop(), complete);
     }
 
     uv_run(uv_default_loop(), UV_RUN_DEFAULT);
diff --git a/test/storage/http_environment.cpp b/test/storage/http_environment.cpp
deleted file mode 100644
index 41a9d43d5..000000000
--- a/test/storage/http_environment.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-#include "storage.hpp"
-
-#include <uv.h>
-
-#include <mbgl/storage/default_file_source.hpp>
-#include <mbgl/storage/network_status.hpp>
-
-#include <cmath>
-
-TEST_F(Storage, HTTPCancelEnvironment) {
-    SCOPED_TEST(HTTPRetainedEnvironment)
-    SCOPED_TEST(HTTPCanceledEnvironment)
-
-    using namespace mbgl;
-
-    DefaultFileSource fs(nullptr);
-
-    // Create two fake environment pointers. The FileSource implementation treats these as opaque
-    // pointers and doesn't reach into them.
-    auto &env1 = *reinterpret_cast<const Environment *>(1);
-    auto &env2 = *reinterpret_cast<const Environment *>(2);
-
-    const Resource resource { Resource::Unknown, "http://127.0.0.1:3000/delayed" };
-
-    // Environment 1
-    fs.request(resource, uv_default_loop(), env1, [&](const Response &res) {
-        // This environment gets aborted below. This means the request is marked as failing and
-        // will return an error here.
-        EXPECT_EQ(Response::Error, res.status);
-        EXPECT_EQ("", res.data);
-        EXPECT_EQ(0, res.expires);
-        EXPECT_EQ(0, res.modified);
-        EXPECT_EQ("", res.etag);
-        EXPECT_EQ("Environment is terminating", res.message);
-        HTTPCanceledEnvironment.finish();
-    });
-
-    // Environment 2
-    fs.request(resource, uv_default_loop(), env2, [&](const Response &res) {
-        // The same request as above, but in a different environment which doesn't get aborted. This
-        // means the request should succeed.
-        EXPECT_EQ(Response::Successful, res.status);
-        EXPECT_EQ("Response", res.data);
-        EXPECT_EQ(0, res.expires);
-        EXPECT_EQ(0, res.modified);
-        EXPECT_EQ("", res.etag);
-        EXPECT_EQ("", res.message);
-        HTTPRetainedEnvironment.finish();
-    });
-
-    fs.abort(env1);
-
-    uv_run(uv_default_loop(), UV_RUN_DEFAULT);
-}
diff --git a/test/storage/http_error.cpp b/test/storage/http_error.cpp
index e5728d97b..eeb8117a0 100644
--- a/test/storage/http_error.cpp
+++ b/test/storage/http_error.cpp
@@ -22,12 +22,10 @@ TEST_F(Storage, HTTPError) {
 
     DefaultFileSource fs(nullptr);
 
-    auto &env = *static_cast<const Environment *>(nullptr);
-
     auto start = uv_hrtime();
 
     fs.request({ Resource::Unknown, "http://127.0.0.1:3000/temporary-error" }, uv_default_loop(),
-               env, [&](const Response &res) {
+               [&](const Response &res) {
         const auto duration = double(uv_hrtime() - start) / 1e9;
         EXPECT_LT(1, duration) << "Backoff timer didn't wait 1 second";
         EXPECT_GT(1.2, duration) << "Backoff timer fired too late";
@@ -41,7 +39,7 @@ TEST_F(Storage, HTTPError) {
         HTTPTemporaryError.finish();
     });
 
-    fs.request({ Resource::Unknown, "http://127.0.0.1:3001/" }, uv_default_loop(), env,
+    fs.request({ Resource::Unknown, "http://127.0.0.1:3001/" }, uv_default_loop(),
                [&](const Response &res) {
         const auto duration = double(uv_hrtime() - start) / 1e9;
         // 1.5 seconds == 4 retries, with a 500ms timeout (see above).
diff --git a/test/storage/http_header_parsing.cpp b/test/storage/http_header_parsing.cpp
index 1561660b6..5f18b163a 100644
--- a/test/storage/http_header_parsing.cpp
+++ b/test/storage/http_header_parsing.cpp
@@ -15,11 +15,9 @@ TEST_F(Storage, HTTPHeaderParsing) {
 
     DefaultFileSource fs(nullptr);
 
-    auto &env = *static_cast<const Environment *>(nullptr);
-
     fs.request({ Resource::Unknown,
                  "http://127.0.0.1:3000/test?modified=1420794326&expires=1420797926&etag=foo" },
-               uv_default_loop(), env, [&](const Response &res) {
+               uv_default_loop(), [&](const Response &res) {
         EXPECT_EQ(Response::Successful, res.status);
         EXPECT_EQ("Hello World!", res.data);
         EXPECT_EQ(1420797926, res.expires);
@@ -33,7 +31,7 @@ TEST_F(Storage, HTTPHeaderParsing) {
                        SystemClock::now().time_since_epoch()).count();
 
     fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test?cachecontrol=max-age=120" },
-               uv_default_loop(), env, [&](const Response &res) {
+               uv_default_loop(), [&](const Response &res) {
         EXPECT_EQ(Response::Successful, res.status);
         EXPECT_EQ("Hello World!", res.data);
         EXPECT_GT(2, std::abs(res.expires - now - 120)) << "Expiration date isn't about 120 seconds in the future";
diff --git a/test/storage/http_issue_1369.cpp b/test/storage/http_issue_1369.cpp
new file mode 100644
index 000000000..44c190c82
--- /dev/null
+++ b/test/storage/http_issue_1369.cpp
@@ -0,0 +1,44 @@
+#include "storage.hpp"
+
+#include <uv.h>
+
+#include <mbgl/storage/default_file_source.hpp>
+#include <mbgl/storage/sqlite_cache.hpp>
+
+// Test for https://github.com/mapbox/mapbox-gl-native/issue/1369
+//
+// A request for http://example.com is made. This triggers a cache get. While the cache get is
+// pending, the request is canceled. This removes it from pending. Then, still while the cache get
+// is pending, a second request is made for the same resource. This adds an entry back to pending
+// and queues another cache request, even though the first one is still pending. Now both cache
+// requests resolve to misses, resulting in two HTTP requests for the same resource. The first one
+// will notify as expected, the second one will have bound a DefaultFileRequest* in the lambda that
+// gets invalidated by the first notify's pending.erase, and when it gets notified, the crash
+// occurs.
+
+TEST_F(Storage, HTTPIssue1369) {
+    SCOPED_TEST(HTTPIssue1369)
+
+    using namespace mbgl;
+
+    SQLiteCache cache;
+    DefaultFileSource fs(&cache);
+
+    const Resource resource { Resource::Unknown, "http://127.0.0.1:3000/test" };
+
+    auto req = fs.request(resource, uv_default_loop(), [&](const Response&) {
+        ADD_FAILURE() << "Callback should not be called";
+    });
+    fs.cancel(req);
+    fs.request(resource, uv_default_loop(), [&](const Response &res) {
+        EXPECT_EQ(Response::Successful, res.status);
+        EXPECT_EQ("Hello World!", res.data);
+        EXPECT_EQ(0, res.expires);
+        EXPECT_EQ(0, res.modified);
+        EXPECT_EQ("", res.etag);
+        EXPECT_EQ("", res.message);
+        HTTPIssue1369.finish();
+    });
+
+    uv_run(uv_default_loop(), UV_RUN_DEFAULT);
+}
diff --git a/test/storage/http_load.cpp b/test/storage/http_load.cpp
index c4069eba3..2347a76ab 100644
--- a/test/storage/http_load.cpp
+++ b/test/storage/http_load.cpp
@@ -11,8 +11,6 @@ TEST_F(Storage, HTTPLoad) {
 
     DefaultFileSource fs(nullptr);
 
-    auto &env = *static_cast<const Environment *>(nullptr);
-
     const int concurrency = 50;
     const int max = 10000;
     int number = 1;
@@ -21,7 +19,7 @@ TEST_F(Storage, HTTPLoad) {
         const auto current = number++;
         fs.request({ Resource::Unknown,
                      std::string("http://127.0.0.1:3000/load/") + std::to_string(current) },
-                   uv_default_loop(), env, [&, current](const Response &res) {
+                   uv_default_loop(), [&, current](const Response &res) {
             EXPECT_EQ(Response::Successful, res.status);
             EXPECT_EQ(std::string("Request ") +  std::to_string(current), res.data);
             EXPECT_EQ(0, res.expires);
diff --git a/test/storage/http_noloop.cpp b/test/storage/http_noloop.cpp
deleted file mode 100644
index cd4ebeb2c..000000000
--- a/test/storage/http_noloop.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "storage.hpp"
-
-#include <uv.h>
-
-#include <mbgl/storage/default_file_source.hpp>
-#include <mbgl/util/uv.hpp>
-
-TEST_F(Storage, HTTPNoLoop) {
-    SCOPED_TEST(HTTPNoLoop)
-
-    using namespace mbgl;
-
-    DefaultFileSource fs(nullptr);
-
-    auto &env = *static_cast<const Environment *>(nullptr);
-
-    const auto mainThread = uv_thread_self();
-
-    // Async handle that keeps the main loop alive until the thread finished
-    auto async = new uv_async_t;
-    uv_async_init(uv_default_loop(), async, [] (uv_async_t *as, int) {
-        uv::close(as);
-    });
-
-    fs.request({ Resource::Unknown, "http://127.0.0.1:3000/temporary-error" }, nullptr, env,
-               [&](const Response &res) {
-        EXPECT_NE(uv_thread_self(), mainThread) << "Response was called in the same thread";
-        EXPECT_EQ(Response::Successful, res.status);
-        EXPECT_EQ("Hello World!", res.data);
-        EXPECT_EQ(0, res.expires);
-        EXPECT_EQ(0, res.modified);
-        EXPECT_EQ("", res.etag);
-        EXPECT_EQ("", res.message);
-        HTTPNoLoop.finish();
-
-        uv_async_send(async);
-    });
-
-    uv_run(uv_default_loop(), UV_RUN_DEFAULT);
-}
diff --git a/test/storage/http_other_loop.cpp b/test/storage/http_other_loop.cpp
index 9ad673cf7..64612f13d 100644
--- a/test/storage/http_other_loop.cpp
+++ b/test/storage/http_other_loop.cpp
@@ -12,9 +12,7 @@ TEST_F(Storage, HTTPOtherLoop) {
     // This file source launches a separate thread to do the processing.
     DefaultFileSource fs(nullptr);
 
-    auto &env = *static_cast<const Environment *>(nullptr);
-
-    fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, uv_default_loop(), env,
+    fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, uv_default_loop(),
                [&](const Response &res) {
         EXPECT_EQ(Response::Successful, res.status);
         EXPECT_EQ("Hello World!", res.data);
diff --git a/test/storage/http_reading.cpp b/test/storage/http_reading.cpp
index 350a8eaa4..b322bbf2a 100644
--- a/test/storage/http_reading.cpp
+++ b/test/storage/http_reading.cpp
@@ -14,11 +14,9 @@ TEST_F(Storage, HTTPReading) {
 
     DefaultFileSource fs(nullptr);
 
-    auto &env = *static_cast<const Environment *>(nullptr);
-
     const auto mainThread = uv_thread_self();
 
-    fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, uv_default_loop(), env,
+    fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, uv_default_loop(),
                [&](const Response &res) {
         EXPECT_EQ(uv_thread_self(), mainThread);
         EXPECT_EQ(Response::Successful, res.status);
@@ -31,7 +29,7 @@ TEST_F(Storage, HTTPReading) {
     });
 
     fs.request({ Resource::Unknown, "http://127.0.0.1:3000/doesnotexist" }, uv_default_loop(),
-               env, [&](const Response &res) {
+               [&](const Response &res) {
         EXPECT_EQ(uv_thread_self(), mainThread);
         EXPECT_EQ(Response::Error, res.status);
         EXPECT_EQ("HTTP status code 404", res.message);
@@ -51,31 +49,10 @@ TEST_F(Storage, HTTPNoCallback) {
 
     DefaultFileSource fs(nullptr);
 
-    auto &env = *static_cast<const Environment *>(nullptr);
-
-    fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, uv_default_loop(), env,
+    fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, uv_default_loop(),
                nullptr);
 
     uv_run(uv_default_loop(), UV_RUN_DEFAULT);
 
     HTTPTest.finish();
 }
-
-TEST_F(Storage, HTTPCallbackNotOnLoop) {
-    using namespace mbgl;
-
-    DefaultFileSource fs(nullptr);
-
-    SCOPED_TEST(HTTPTest)
-
-    auto &env = *static_cast<const Environment *>(nullptr);
-
-    std::promise<void> promise;
-    fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, env, [&] (const Response &) {
-        promise.set_value();
-    });
-
-    promise.get_future().get();
-
-    HTTPTest.finish();
-}
diff --git a/test/suite b/test/suite
index 6ac151538..d4fb34452 160000
--- a/test/suite
+++ b/test/suite
@@ -1 +1 @@
-Subproject commit 6ac15153826ab26f778d61034119ffa8f97566ac
+Subproject commit d4fb3445252aa7d0666bf563634d2007cb573c03
diff --git a/test/test.gypi b/test/test.gypi
index b16ffe326..bc2901653 100644
--- a/test/test.gypi
+++ b/test/test.gypi
@@ -17,7 +17,7 @@
     },
     { 'target_name': 'test',
       'type': 'executable',
-      'include_dirs': [ '../include', '../src' ],
+      'include_dirs': [ '../include', '../src', '../platform/default' ],
       'dependencies': [
         'symlink_TEST_DATA',
         '../mbgl.gyp:core',
@@ -41,16 +41,21 @@
         'headless/headless.cpp',
 
         'miscellaneous/clip_ids.cpp',
+        'miscellaneous/binpack.cpp',
         'miscellaneous/bilinear.cpp',
         'miscellaneous/comparisons.cpp',
         'miscellaneous/enums.cpp',
         'miscellaneous/functions.cpp',
+        'miscellaneous/map.cpp',
+        'miscellaneous/map_context.cpp',
         'miscellaneous/mapbox.cpp',
         'miscellaneous/merge_lines.cpp',
         'miscellaneous/style_parser.cpp',
         'miscellaneous/text_conversions.cpp',
+        'miscellaneous/transform.cpp',
         'miscellaneous/tile.cpp',
         'miscellaneous/variant.cpp',
+        'miscellaneous/worker.cpp',
 
         'storage/storage.hpp',
         'storage/storage.cpp',
@@ -61,25 +66,27 @@
         'storage/file_reading.cpp',
         'storage/http_cancel.cpp',
         'storage/http_coalescing.cpp',
-        'storage/http_environment.cpp',
         'storage/http_error.cpp',
         'storage/http_header_parsing.cpp',
+        'storage/http_issue_1369.cpp',
         'storage/http_load.cpp',
-        'storage/http_noloop.cpp',
         'storage/http_other_loop.cpp',
         'storage/http_reading.cpp',
       ],
       'libraries': [
         '<@(uv_static_libs)',
+        '<@(sqlite3_static_libs)',
       ],
       'variables': {
         'cflags_cc': [
           '<@(uv_cflags)',
           '<@(opengl_cflags)',
           '<@(boost_cflags)',
+          '<@(sqlite3_cflags)',
         ],
         'ldflags': [
           '<@(uv_ldflags)',
+          '<@(sqlite3_ldflags)',
         ],
       },
       'conditions': [