Merge branch 'master' into jgrpp

# Conflicts:
#	cmake/CompileFlags.cmake
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/cargopacket.cpp
#	src/cheat_gui.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/core/pool_func.hpp
#	src/date.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/ground_vehicle.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/lang/dutch.txt
#	src/lang/french.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/mcf.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_station.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/station_cmd.cpp
#	src/station_kdtree.h
#	src/string_func.h
#	src/table/settings.ini
#	src/tgp.cpp
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/tree_gui.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/viewport_sprite_sorter_sse4.cpp
#	src/window.cpp

src/saveload/saveload_buffer.h

@@ -117,7 +117,7 @@ struct ReadBuffer {
 			if (unlikely(this->bufp == this->bufe)) {
 				this->AcquireBytes();
 			}
-			size_t to_copy = min<size_t>(this->bufe - this->bufp, length);
+			size_t to_copy = std::min<size_t>(this->bufe - this->bufp, length);
 			memcpy(ptr, this->bufp, to_copy);
 			this->bufp += to_copy;
 			ptr += to_copy;
@@ -201,7 +201,7 @@ struct MemoryDumper {
 			if (unlikely(this->buf == this->bufe)) {
 				this->AllocateBuffer();
 			}
-			size_t to_copy = min<size_t>(this->bufe - this->buf, length);
+			size_t to_copy = std::min<size_t>(this->bufe - this->buf, length);
 			memcpy(this->buf, ptr, to_copy);
 			this->buf += to_copy;
 			ptr += to_copy;