Merge branch '32-bit-loff_t'