Merge branch 'client-hostfile' of git://github.com/bengland2/fio