[Dev] The Geonames ID is now also indexed.
Merge branch 'trunk' into releases