Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason

Conflicts:
	src/mbgl/shader/shader.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/configure b/configure
index cc86f097c6..d80aa6bd47 100755
--- a/configure
+++ b/configure
@@ -38,7 +38,7 @@ case ${MASON_PLATFORM} in
         ;;
     *)
         GLFW_VERSION=e1ae9af5
-        SQLITE_VERSION=system
+        SQLITE_VERSION=3.8.6
         LIBPNG_VERSION=1.6.13
         LIBJPEG_VERSION=v8d
         LIBCURL_VERSION=system