Merge branch 'jgrpp' into jgrpp-beta

# Conflicts:
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp

src/saveload/saveload.cpp

@@ -801,7 +801,9 @@ void SlSetLength(size_t length)
 					 *
 					 * If we have more than 28 bits, use an extra uint32 and
 					 * signal this using the extended chunk header */
+#ifdef POINTER_IS_64BIT
 					assert(length < (1LL << 32));
+#endif
 					if (length >= (1 << 28)) {
 						/* write out extended chunk header */
 						SlWriteByte(CH_EXT_HDR);