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/console.cpp

@@ -235,8 +235,8 @@ void IConsoleAddSorted(T **base, T *item_new)
 
 /**
  * Remove underscores from a string; the string will be modified!
- * @param name The string to remove the underscores from.
- * @return #name.
+ * @param[in,out] name String to remove the underscores from.
+ * @return \a name, with its contents modified.
  */
 char *RemoveUnderscores(char *name)
 {