Update GeoData to master tip

Change-Id: If489b68f0481f2a9561f88f0db37b989122c23c0