Update GeoData to master tip

Change-Id: I9ea4a3191f9a9d6a3af96ee94382786042b16b59
Merge "Update GeoData to master tip" into wmf/1.22wmf10