Support for GeoPoint fragment
Merge branch 'geopoint'