Update from upstream including metadata

Mostly r610 - Update to geocoder