Merge branch 'unified-merge' of https://github.com/jeffreyalien/fio