Merge branch 'master' into jgrpp

# Conflicts:
#	src/lang/english_AU.txt
#	src/openttd.cpp
#	src/viewport_sprite_sorter_sse4.cpp

src/debug.h

@@ -66,7 +66,7 @@ extern std::string _loadgame_DBGC_data;
 void CDECL debug(const char *dbg, const char *format, ...) WARN_FORMAT(2, 3);
 
 char *DumpDebugFacilityNames(char *buf, char *last);
-void SetDebugString(const char *s);
+void SetDebugString(const char *s, void (*error_func)(const char *));
 const char *GetDebugString();
 
 /* Shorter form for passing filename and linenumber */