Merge branch 'master' into jgrpp

# Conflicts:
#	src/network/network.cpp

src/station_cmd.cpp

@@ -394,13 +394,10 @@ void Station::GetTileArea(TileArea *ta, StationType type) const
 		case STATION_DOCK:
 		case STATION_OILRIG:
 			*ta = this->docking_station;
-			break;
+			return;
 
 		default: NOT_REACHED();
 	}
-
-	ta->w = 1;
-	ta->h = 1;
 }
 
 /**