Merge branch 'guasi_fixes' of https://github.com/sitsofe/fio into master