Update GeoData to master tip

Change-Id: Ibd9b3e72317cab095b7ab1768204a57ba269faaf