Merge branch 'fiologparser-fix' of https://github.com/patrakov/fio