Update GeoData to master

Change-Id: I47294a89be69c506f7bde7156b6ee26b6ac967e9