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

Conflicts:
	include/mbgl/map/map.hpp
	src/map/map.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/configure b/configure
index 0a7811053e..fe39e7767c 100755
--- a/configure
+++ b/configure
@@ -45,7 +45,7 @@ case ${MASON_PLATFORM} in
         LIBUV_VERSION=0.10.28
         ZLIB_VERSION=system
         BOOST_VERSION=system
-        NUNICODE_VERSION=1.5-dev
+        NUNICODE_VERSION=1.5.1
         ;;
 esac