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