Merge branch 'master' into mapbox-gl-native
Merge branch 'mapbox-gl-native' into libuv-pkgconfig