Merge branch 'master' into jgrpp

# Conflicts:
#	src/gamelog.cpp

src/saveload/afterload.cpp

@@ -1039,6 +1039,9 @@ bool AfterLoadGame()
 			case MP_STATION: {
 				BaseStation *bst = BaseStation::GetByTile(t);
 
+				/* Sanity check */
+				if (bst->owner != GetTileOwner(t)) SlErrorCorrupt("Wrong owner for station tile");
+
 				/* Set up station spread */
 				bst->rect.BeforeAddTile(t, StationRect::ADD_FORCE);