Pre-2.5

Prepwork for zlib support (PS3/iOS)