Update GeoData to master tip

Change-Id: I8c1df46bf42b0854c3b85bcebe11181d71ab798f