diff --git a/gyp/mbgl-ios.gypi b/gyp/mbgl-ios.gypi
index f5484dad0..a2e6f65ba 100644
--- a/gyp/mbgl-ios.gypi
+++ b/gyp/mbgl-ios.gypi
@@ -36,8 +36,8 @@
         '../platform/darwin/string_nsstring.mm',
         '../platform/darwin/http_request_baton_cocoa.mm',
         '../platform/darwin/image.mm',
-        '../platform/default/asset_request_baton_noop.cpp',
         '../platform/default/caching_http_file_source.cpp',
+        '../platform/default/asset_request_baton_noop.cpp',
       ],
       'include_dirs': [
         '../include',
diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi
index cfdb0445c..2f402075a 100644
--- a/gyp/mbgl-linux.gypi
+++ b/gyp/mbgl-linux.gypi
@@ -35,8 +35,8 @@
         '../platform/default/image_reader.cpp',
         '../platform/default/png_reader.cpp',
         '../platform/default/jpeg_reader.cpp',
-        '../platform/default/asset_request_baton_noop.cpp',
         '../platform/default/caching_http_file_source.cpp',
+        '../platform/default/asset_request_baton_noop.cpp',
       ],
       'include_dirs': [
         '../include',
diff --git a/gyp/mbgl-osx.gypi b/gyp/mbgl-osx.gypi
index f2cdc4cbd..d0eae5673 100644
--- a/gyp/mbgl-osx.gypi
+++ b/gyp/mbgl-osx.gypi
@@ -11,8 +11,8 @@
         '../platform/darwin/string_nsstring.mm',
         '../platform/darwin/http_request_baton_cocoa.mm',
         '../platform/darwin/image.mm',
-        '../platform/default/asset_request_baton_noop.cpp',
         '../platform/default/caching_http_file_source.cpp',
+        '../platform/default/asset_request_baton_noop.cpp',
       ],
       'include_dirs': [
         '../include',
diff --git a/ios/mapbox-gl-cocoa b/ios/mapbox-gl-cocoa
index baad2aa92..af6a9c9fd 160000
--- a/ios/mapbox-gl-cocoa
+++ b/ios/mapbox-gl-cocoa
@@ -1 +1 @@
-Subproject commit baad2aa920e45f60241439cae718adebf35c80ff
+Subproject commit af6a9c9fd211f931e4d34be3c7173c52341e5eb6
diff --git a/platform/default/caching_http_file_source.cpp b/platform/default/caching_http_file_source.cpp
index 9c51489a2..b7cbb268f 100644
--- a/platform/default/caching_http_file_source.cpp
+++ b/platform/default/caching_http_file_source.cpp
@@ -30,7 +30,7 @@ CachingHTTPFileSource::CachingHTTPFileSource(const std::string &path_)
 CachingHTTPFileSource::~CachingHTTPFileSource() {
     if (hasLoop()) {
         // FIXME temp fix for #608 crash
-        //assert(thread_id == uv_thread_self());
+        // assert(thread_id == uv_thread_self());
         uv_messenger_stop(queue, [](uv_messenger_t *msgr) {
             delete msgr;
         });