CDB-1699 Change geocoding API queries to match temporary table structure
CDB-1699 Use contry names instead of iso3 codes for internal functions
Merge branch 'CDB-1699' of github.com:CartoDB/cartodb into CDB-1699