Merge branch 'master' into waypoint-arrival

Conflicts:
	src/RoutePoint.cpp