diff --git a/mapboxgl.gyp b/mapboxgl.gyp
index 3b5fe13d2..aa40402ff 100644
--- a/mapboxgl.gyp
+++ b/mapboxgl.gyp
@@ -31,7 +31,7 @@
             '<(SHARED_INTERMEDIATE_DIR)/src/shader/shaders_gl.cpp',
             '<(SHARED_INTERMEDIATE_DIR)/src/shader/shaders_gles2.cpp'
         ],
-        'include_dirs':[
+        'include_dirs': [
           '<(SHARED_INTERMEDIATE_DIR)/include/',
         ]
       }
@@ -126,17 +126,17 @@
         '<!@(find src -name "*.glsl")',
         'bin/style.json'
       ],
-      'include_dirs':[
+      'include_dirs': [
         './include'
       ],
       'conditions': [
         ['OS == "mac"', {
           'xcode_settings': {
             'SDKROOT': 'macosx',
-            'SUPPORTED_PLATFORMS':['macosx'],
-            'MACOSX_DEPLOYMENT_TARGET':'10.9',
+            'SUPPORTED_PLATFORMS': ['macosx'],
+            'MACOSX_DEPLOYMENT_TARGET': '10.9',
             'PUBLIC_HEADERS_FOLDER_PATH': 'include',
-            'OTHER_CPLUSPLUSFLAGS':[
+            'OTHER_CPLUSPLUSFLAGS': [
               '<@(png_cflags)',
               '<@(uv_cflags)',
               '<@(curl_cflags)',
@@ -147,6 +147,7 @@
         }, {
           'cflags': [
             '<@(png_cflags)',
+            '<@(uv_cflags)',
             '<@(curl_cflags)',
             '<@(sqlite3_cflags)',
             '-I<(boost_root)/include',
@@ -154,38 +155,28 @@
         }]
       ],
       'direct_dependent_settings': {
-          'include_dirs':[
-              './include',
-          ],
-          'cflags': [
-              '<@(png_cflags)',
-              '<@(uv_cflags)',
-          ],
-          'xcode_settings': {
-            'OTHER_CPLUSPLUSFLAGS':[
-                '<@(png_cflags)',
-                '<@(uv_cflags)',
-            ]
-          },
-          'conditions': [
-            ['OS == "mac"', {
-              'xcode_settings': {
-                'OTHER_LDFLAGS': [
-                    '<@(png_libraries)',
-                    '<@(uv_libraries)',
-                    '<@(curl_libraries)',
-                    '<@(sqlite3_libraries)',
-                ]
-              }
-            }, {
-              'libraries': [
+        'include_dirs': [
+          './include',
+        ],
+        'conditions': [
+          ['OS == "mac"', {
+            'xcode_settings': {
+              'OTHER_LDFLAGS': [
                 '<@(png_libraries)',
                 '<@(uv_libraries)',
                 '<@(curl_libraries)',
                 '<@(sqlite3_libraries)',
               ]
-            }]
-          ]
+            }
+          }, {
+            'libraries': [
+              '<@(png_libraries)',
+              '<@(uv_libraries)',
+              '<@(curl_libraries)',
+              '<@(sqlite3_libraries)',
+            ]
+          }]
+        ]
       }
     },
     {
@@ -194,7 +185,7 @@
       'type': 'static_library',
       'hard_dependency': 1,
       'dependencies': [
-          'shaders',
+        'shaders',
       ],
       'sources': [
         '<!@(find src/ \( -name "*.cpp" ! -name shaders.hpp ! -name shaders_gles2.cpp ! -name shaders_gl.cpp \))',
@@ -208,64 +199,36 @@
       ],
       'xcode_settings': {
         'SDKROOT': 'iphoneos',
-        'SUPPORTED_PLATFORMS':['iphonesimulator','iphoneos'],
+        'SUPPORTED_PLATFORMS': ['iphonesimulator','iphoneos'],
         'ARCHS': [ "armv7", "armv7s", "arm64", "i386", "x86_64" ],
         'TARGETED_DEVICE_FAMILY': '1,2',
         'CODE_SIGN_IDENTITY': 'iPhone Developer',
         'IPHONEOS_DEPLOYMENT_TARGET': '7.0',
         'PUBLIC_HEADERS_FOLDER_PATH': 'include',
-        'GCC_INPUT_FILETYPE':'sourcecode.cpp.cpp',
-        'OTHER_CPLUSPLUSFLAGS':[
+        'GCC_INPUT_FILETYPE': 'sourcecode.cpp.cpp',
+        'OTHER_CPLUSPLUSFLAGS': [
           '<@(png_cflags)',
           '<@(uv_cflags)',
+          '<@(curl_cflags)',
           '<@(sqlite3_cflags)',
           '-I<(boost_root)/include',
         ],
-        'OTHER_LDFLAGS': [
-          '<@(sqlite3_libraries)',
-        ],
       },
-      'include_dirs':[
-          './include'
-      ],
-      'cflags': [
-          '<@(png_cflags)',
-          '<@(uv_cflags)',
-          '<@(sqlite3_cflags)',
-          '-I<(boost_root)/include',
-      ],
-      'libraries': [
-        '<@(sqlite3_libraries)',
+      'include_dirs': [
+        './include'
       ],
       'direct_dependent_settings': {
-          'include_dirs':[
-              './include'
-          ],
-          'cflags': [
-              '<@(png_cflags)',
-              '<@(uv_cflags)',
-          ],
-          'xcode_settings': {
-            'OTHER_CPLUSPLUSFLAGS':[
-                '<@(png_cflags)',
-                '<@(uv_cflags)',
-            ]
-          },
-          'conditions': [
-            ['OS == "mac"', {
-              'xcode_settings': {
-                'OTHER_LDFLAGS': [
-                    '<@(png_libraries)',
-                    '<@(uv_libraries)',
-                ]
-              }
-            }, {
-              'libraries': [
-                '<@(png_libraries)',
-                '<@(uv_libraries)'
-              ]
-            }]
+        'include_dirs': [
+          './include',
+        ],
+        'xcode_settings': {
+          'OTHER_LDFLAGS': [
+            '<@(png_libraries)',
+            '<@(uv_libraries)',
+            '<@(curl_libraries)',
+            '<@(sqlite3_libraries)',
           ]
+        }
       }
     }
   ]
diff --git a/setup-libraries.sh b/setup-libraries.sh
index 35f852179..83ed1b556 100755
--- a/setup-libraries.sh
+++ b/setup-libraries.sh
@@ -53,6 +53,7 @@ NPM=$(which npm)
 
 MP_HASH="eb8c6d7e6bd6adb42c232ed806b889f3e6825bb5"
 DIR_HASH=$(echo `pwd` | git hash-object --stdin)
+
 if [ ! -d 'mapnik-packaging/' ]; then
   git clone https://github.com/mapnik/mapnik-packaging.git
 fi
@@ -90,14 +91,14 @@ source iPhoneOSs.sh
     if [ ! -f out/build-cpp11-libcpp-armv7s-iphoneoss/lib/libpng.a ] ; then ./scripts/build_png.sh ; fi
     if [ ! -f out/build-cpp11-libcpp-armv7s-iphoneoss/lib/libuv.a ] ; then ./scripts/build_libuv.sh ; fi
     if [ ! -f out/build-cpp11-libcpp-armv7s-iphoneoss/lib/libcurl.a ] ; then ./scripts/build_curl.sh ; fi
-    if [ ! -f out/build-cpp11-libcpp-armv7s-iphoneoss/lib/libsqlite3.a ] ; then ./scripts/build_libsqlite.sh ; fi
+    if [ ! -f out/build-cpp11-libcpp-armv7s-iphoneoss/lib/libsqlite3.a ] ; then ./scripts/build_sqlite.sh ; fi
     echo '     ...done'
 
 source iPhoneOS64.sh
     if [ ! -f out/build-cpp11-libcpp-arm64-iphoneos64/lib/libpng.a ] ; then ./scripts/build_png.sh ; fi
     if [ ! -f out/build-cpp11-libcpp-arm64-iphoneos64/lib/libuv.a ] ; then ./scripts/build_libuv.sh ; fi
     if [ ! -f out/build-cpp11-libcpp-arm64-iphoneos64/lib/libcurl.a ] ; then ./scripts/build_curl.sh ; fi
-    if [ ! -f out/build-cpp11-libcpp-arm64-iphoneos64/lib/libsqlite3.a ] ; then ./scripts/build_libsqlite.sh ; fi
+    if [ ! -f out/build-cpp11-libcpp-arm64-iphoneos64/lib/libsqlite3.a ] ; then ./scripts/build_sqlite.sh ; fi
     echo '     ...done'
 
 source iPhoneSimulator.sh
@@ -126,6 +127,8 @@ source MacOSX.sh
 
 # setup iOS universal libs
 ./scripts/make_universal.sh
+patch -p0 --forward < patches/curl-ios.diff || true
+echo "NOTE: One patch FAILURE is expected. The other should have been applied or ignored."
 
 if [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then
     tar -zcf out/build-cpp11-libcpp-ios_${MP_HASH}_${DIR_HASH}.tar.gz out/build-cpp11-libcpp-universal
diff --git a/src/platform/response.cpp b/src/platform/response.cpp
index f2117c889..ce376380f 100644
--- a/src/platform/response.cpp
+++ b/src/platform/response.cpp
@@ -8,6 +8,11 @@ namespace platform {
 
 
 void Response::setCacheControl(const char *value) {
+    if (!value) {
+        expires = -1;
+        return;
+    }
+
     int seconds = 0;
     // TODO: cache-control may contain other information as well:
     // http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9