Update GeoData to master

Change-Id: I08578e45ad9f4726fa054a03da9a920fec349c18
Merge "Update GeoData to master" into wmf/1.21wmf10