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

@@ -711,7 +711,7 @@ static bool MakeSmallScreenshot(bool crashlog)
 /**
  * Configure a ViewPort for rendering (a part of) the map into a screenshot.
  * @param t Screenshot type
- * @param [out] vp Result viewport
+ * @param[out] vp Result viewport
  */
 void SetupScreenshotViewport(ScreenshotType t, ViewPort *vp)
 {
@@ -767,7 +767,7 @@ static bool MakeLargeWorldScreenshot(ScreenshotType t)
 /**
  * Callback for generating a heightmap. Supports 8bpp grayscale only.
  * @param userdata Pointer to user data.
- * @param buf      Destination buffer.
+ * @param buffer   Destination buffer.
  * @param y        Line number of the first line to write.
  * @param pitch    Number of pixels to write (1 byte for 8bpp, 4 bytes for 32bpp). @see Colour
  * @param n        Number of lines to write.