Replace use of waypoints
Merge branch 'develop' of ssh://illarion.org:1010/scripts into develop