Merge geolocation parameters from sjbrunst:master