Merge branch 'fixes_1290' of https://github.com/rthardin/fio