Merge branch 'master' into save_ext

# Conflicts:
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h

src/core/math_func.hpp

@@ -370,6 +370,23 @@ static inline int RoundDivSU(int a, uint b)
 	}
 }
 
+/**
+ * Computes (a / b) rounded away from zero.
+ * @param a Numerator
+ * @param b Denominator
+ * @return Quotient, rounded away from zero
+ */
+static inline int DivAwayFromZero(int a, uint b)
+{
+	const int _b = static_cast<int>(b);
+	if (a > 0) {
+		return (a + _b - 1) / _b;
+	} else {
+		/* Note: Behaviour of negative numerator division is truncation toward zero. */
+		return (a - _b + 1) / _b;
+	}
+}
+
 uint32 IntSqrt(uint32 num);
 
 #endif /* MATH_FUNC_HPP */