Merge pull request #924 from mapbox/gpx-fix

Gpx fix
Merge branch 'mb-pages' into gpx-fix