redo of 23970193473fad931245e3f2f7874eef3bf72924
Merge branch 'master' of github.com:mapbox/mapbox-gl-native