Merge branch 'master' into jgrpp

# Conflicts:
#	src/company_gui.cpp
#	src/core/math_func.hpp
#	src/highscore.cpp
#	src/tests/math_func.cpp

src/script/api/script_tilelist.hpp

@@ -37,7 +37,7 @@ public:
 	void AddTile(TileIndex tile);
 
 	/**
-	 * Remove the tiles inside the rectangle between tile_from and tile_to form the list.
+	 * Remove the tiles inside the rectangle between tile_from and tile_to from the list.
 	 * @param tile_from One corner of the tiles to remove.
 	 * @param tile_to The other corner of the files to remove.
 	 * @pre ScriptMap::IsValidTile(tile_from).