Update GeoData to master tip

Change-Id: I4d10315b95e72a9f609db828be2c6f0c0790413b
Merge "Update GeoData to master tip" into wmf/1.22wmf9