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