Merge branch 'master' of https://github.com/horshack-dpreview/fio