Update GeoData to master

Change-Id: I7f667eb7302483a5ba74ed433e8ae04e2518d46c