Purge invalid waypoints (0,0)
Merge branch 'focusmarker'