Merge branch 'wip-cleanup' of https://github.com/ZVampirEM77/fio