VERSION: Step to release build
Merge branch '11.x'
Merge branch '11.x'
Merge branch '11.x'
VERSION: Increment to 20.21
FIX: The heuristic for A* routing had become de-calibrated from the routing cost calculations, causing inefficient routing
CHANGE: Simuconf.tab max_route_steps value set to 2,000,000 and comment adjusted
FIX: When convoys are stopped and loading at a place that is not a halt, let them move on.
FIX: Occasionally, convoys would reserve inappropriate tiles, causing blockages
FIX: Overflow caused infinite loop in some cases
FIX: Way constraints not properly set when creating a tunnel entrance in some cases
CHANGE: Ships on open water do not go to the depot automatically when they cannot find a route
Merge branch '11.x' into 12.x

Conflicts:
	simversion.h
Merge branch '12.x' into devel-new
Merge branch 'devel-new' into 112.5-merge

Conflicts:
	bauer/tunnelbauer.cc
	dataobj/route.cc
Merge branch '112.5-merge' into way-improvements