Merge branch 'master' into jgrpp-nrt

Merge trunk multiple docks implementation

# Conflicts:
#	docs/landscape_grid.html
#	src/order_cmd.cpp
#	src/pathfinder/npf/npf.cpp
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/rail_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/oldloader_sl.cpp
#	src/saveload/station_sl.cpp
#	src/script/api/script_order.cpp
#	src/ship_cmd.cpp
#	src/station.cpp
#	src/station_base.h
#	src/station_cmd.cpp
#	src/tunnelbridge_cmd.cpp

src/rail_map.h

@@ -17,6 +17,7 @@
 #include "signal_func.h"
 #include "track_func.h"
 #include "tile_map.h"
+#include "water_map.h"
 #include "signal_type.h"
 #include "tunnelbridge_map.h"
 
@@ -594,6 +595,7 @@ static inline void MakeRailNormal(TileIndex t, Owner o, TrackBits b, RailType r)
 {
 	SetTileType(t, MP_RAILWAY);
 	SetTileOwner(t, o);
+	SetDockingTile(t, false);
 	_m[t].m2 = 0;
 	_m[t].m3 = 0;
 	_m[t].m4 = 0;
@@ -608,6 +610,7 @@ static inline void MakeRailDepot(TileIndex t, Owner o, DepotID did, DiagDirectio
 {
 	SetTileType(t, MP_RAILWAY);
 	SetTileOwner(t, o);
+	SetDockingTile(t, false);
 	_m[t].m2 = did;
 	_m[t].m3 = 0;
 	_m[t].m4 = 0;