Merge branch 'master' into jgrpp

# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h

src/network/network_content_gui.cpp

@@ -519,7 +519,7 @@ public:
 	 * Create the content list window.
 	 * @param desc the window description to pass to Window's constructor.
 	 * @param select_all Whether the select all button is allowed or not.
-	 * @param type the main type of content to display or #CONTENT_TYPE_END.
+	 * @param types the main type of content to display or #CONTENT_TYPE_END.
 	 *   When a type other than #CONTENT_TYPE_END is given, dependencies of
 	 *   other types are only shown when content that depend on them are
 	 *   selected.

src/network/network_server.cpp

@@ -2144,7 +2144,7 @@ bool NetworkCompanyHasClients(CompanyID company)
 
 
 /**
- * Get the name of the client, if the user did not send it yet, Client #<no> is used.
+ * Get the name of the client, if the user did not send it yet, Client ID is used.
  * @param client_name The variable to write the name to.
  * @param last        The pointer to the last element of the destination buffer
  */