Merge remote-tracking branch 'upstream/master' into macro

# Conflicts:
#	src/engine/platform/c64.cpp
#	src/gui/insEdit.cpp

src/engine/safeReader.h

@@ -51,7 +51,6 @@ class SafeReader {
     size_t size();
 
     int read(void* where, size_t count);
-    template<typename T> int readByte(T* where, size_t count, unsigned char byte=sizeof(T), Endianness endianness=LittleEndian);
 
     // these functions may throw EndOfFileException.
     signed char readC();