Location geocoding is somewhat working
Merge remote-tracking branch 'origin'