fixed based on base
Merge pull request #793 from mapbox/maintenance

fixed based on base