Update GeoData to master tip

Change-Id: Ib6453eb46a566965ee3a45478691209f7c681310