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

@@ -437,9 +437,9 @@ void UpdateOSKOriginalText(const Window *parent, int button)
 
 /**
  * Check whether the OSK is opened for a specific editbox.
- * @parent w Window to check for
+ * @param w Window to check for
  * @param button Editbox of \a w to check for
- * @return true if the OSK is oppened for \a button.
+ * @return true if the OSK is opened for \a button.
  */
 bool IsOSKOpenedFor(const Window *w, int button)
 {