Merge branch 'master' of github.com:reubot/gtfs-osm-sync