Merge branch 'infrastructure_sharing' into jgrpp

# Conflicts:
#	src/economy.cpp
#	src/misc.cpp
#	src/openttd.cpp
#	src/saveload/extended_ver_sl.cpp

src/misc.cpp

@@ -34,6 +34,7 @@
 #include "bridge_signal_map.h"
 #include "command_func.h"
 #include "zoning.h"
+#include "cargopacket.h"
 
 #include "safeguards.h"
 
@@ -86,6 +87,7 @@ void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settin
 	LinkGraphSchedule::Clear();
 	ClearTraceRestrictMapping();
 	ClearBridgeSimulatedSignalMapping();
+	ClearCargoPacketDeferredPayments();
 	PoolBase::Clean(PT_NORMAL);
 
 	FreeSignalPrograms();