Merge branch 'master' into jgrpp

# Conflicts:
#	src/cargotype.h
#	src/core/CMakeLists.txt
#	src/core/span_type.hpp
#	src/fileio.cpp
#	src/fios.cpp
#	src/misc/endian_buffer.hpp
#	src/misc_gui.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/screenshot.cpp
#	src/settings.cpp
#	src/settings_internal.h
#	src/stdafx.h
#	src/string_func.h
#	src/strings.cpp
#	src/strings_func.h
#	src/strings_internal.h

src/core/checksum_func.hpp

@@ -20,6 +20,7 @@
 #include "../fileio_func.h"
 #include "../date_func.h"
 #include "../debug.h"
+#include <bit>
 #endif /* RANDOM_DEBUG */
 
 struct SimpleChecksum64 {
@@ -27,7 +28,7 @@ struct SimpleChecksum64 {
 
 	void Update(uint64_t input)
 	{
-		this->state = ROL(this->state, 1) ^ input ^ 0x123456789ABCDEF7ULL;
+		this->state = std::rotl(this->state, 1) ^ input ^ 0x123456789ABCDEF7ULL;
 	}
 };