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