Faster route-building method
Merge remote-tracking branch 'origin/master' into itinerary-fix