Merge branch 'osx_fix' of https://github.com/sitsofe/fio