Merge branch 'master' into jgrpp

# Conflicts:
#	src/industry_cmd.cpp
#	src/openttd.cpp
#	src/station_cmd.cpp
#	src/station_func.h

src/saveload/afterload.cpp

@@ -1040,7 +1040,7 @@ bool AfterLoadGame()
 				BaseStation *bst = BaseStation::GetByTile(t);
 
 				/* Sanity check */
-				if (bst->owner != GetTileOwner(t)) SlErrorCorrupt("Wrong owner for station tile");
+				if (!IsBuoy(t) && bst->owner != GetTileOwner(t)) SlErrorCorrupt("Wrong owner for station tile");
 
 				/* Set up station spread */
 				bst->rect.BeforeAddTile(t, StationRect::ADD_FORCE);