Merge branch 'zbd' of https://github.com/bvanassche/fio