Fix bug introduced in 6a41681 (waypoints would not be saved)
Merge branch 'master' into 373-changes