Merge branch 'master' of github.com:axboe/fio into fixtype