Keep the Waypoint Ids stable. Fixes #2341
Merge branch 'release-fix' of https://github.com/Portree-Kid/c-geo-opensource into release
Merge branch 'release' into upstream