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