Use higher-quality lat/lon data source
auto-merge staging into master