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/core/bitmath_func.hpp

@@ -330,6 +330,7 @@ static inline bool HasAtMostOneBit(T value)
 template <typename T>
 static inline T ROL(const T x, const uint8 n)
 {
+	if (n == 0) return x;
 	return (T)(x << n | x >> (sizeof(x) * 8 - n));
 }
 
@@ -345,6 +346,7 @@ static inline T ROL(const T x, const uint8 n)
 template <typename T>
 static inline T ROR(const T x, const uint8 n)
 {
+	if (n == 0) return x;
 	return (T)(x >> n | x << (sizeof(x) * 8 - n));
 }
 

src/core/smallmatrix_type.hpp

@@ -159,7 +159,7 @@ public:
 
 	/**
 	 * Erase a row, replacing it with the last one.
-	 * @param x Position of the row.
+	 * @param y Position of the row.
 	 */
 	void EraseRow(uint y)
 	{
@@ -174,7 +174,7 @@ public:
 
 	/**
 	 * Remove columns from the matrix while preserving the order of other columns.
-	 * @param x First column to remove.
+	 * @param y First column to remove.
 	 * @param count Number of consecutive columns to remove.
 	 */
 	void EraseRowPreservingOrder(uint y, uint count = 1)
@@ -210,8 +210,8 @@ public:
 	/**
 	 * Set the size to a specific width and height, preserving item positions
 	 * as far as possible in the process.
-	 * @param width Target width.
-	 * @param height Target height.
+	 * @param new_width Target width.
+	 * @param new_height Target height.
 	 */
 	inline void Resize(uint new_width, uint new_height)
 	{
@@ -297,7 +297,7 @@ public:
 	/**
 	 * Get column "number" (const)
 	 *
-	 * @param X Position of the column.
+	 * @param x Position of the column.
 	 * @return Column at "number".
 	 */
 	inline const T *operator[](uint x) const
@@ -309,7 +309,7 @@ public:
 	/**
 	 * Get column "number" (const)
 	 *
-	 * @param X Position of the column.
+	 * @param x Position of the column.
 	 * @return Column at "number".
 	 */
 	inline T *operator[](uint x)