Merge branch 'alignment' of https://github.com/sitsofe/fio