fixed and improved gpx child waypoints
Merge branch 'gpx' into next