Upstream changes

Pull upstream changes from Mapbox