refs #509: tickets good, inline TODO bad
Merge branch 'master' of github.com:mapbox/mapbox-gl-native