fix #4284: Upload coordinates has bad title

add a new waypoint_ string
Merge branch 'release' into upstream