Merge branch 'master' into jgrpp

# Conflicts:
#	src/lang/simplified_chinese.txt
#	src/network/core/tcp_content.cpp
#	src/network/core/udp.cpp
#	src/network/network_server.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/table/gameopt_settings.ini

src/network/core/tcp_http.cpp

@@ -203,10 +203,8 @@ int NetworkHTTPSocketHandler::HandleHeader()
 	*url = '\0';
 
 	/* Fetch the hostname, and possible port number. */
-	const char *company = nullptr;
 	const char *port = nullptr;
-	ParseConnectionString(&company, &port, hname);
-	if (company != nullptr) return_error("[tcp/http] invalid hostname");
+	ParseConnectionString(&port, hname);
 
 	NetworkAddress address(hname, port == nullptr ? 80 : atoi(port));