#18 GeoPoint Support:
* Manual merge