Merge branch 'evelu/cleanup' of https://github.com/ErwanAliasr1/fio