Merge branch '32-bit-fixes' of https://github.com/sitsofe/fio