Merge branch 'master' into jgrpp

# Conflicts:
#	src/fileio.cpp
#	src/fileio_func.h
#	src/industry_cmd.cpp
#	src/ini.cpp
#	src/openttd.cpp
#	src/os/windows/win32_main.cpp
#	src/settingsgen/settingsgen.cpp
#	src/strgen/strgen.cpp
#	src/strings.cpp

src/sl/saveload.cpp

@@ -2874,7 +2874,7 @@ struct FileWriter : SaveFilter {
 	~FileWriter()
 	{
 		this->CloseFile();
-		if (!this->temp_name.empty()) unlink(this->temp_name.c_str());
+		if (!this->temp_name.empty()) FioRemove(this->temp_name);
 	}
 
 	void Write(uint8_t *buf, size_t size) override