Merge https://bitbucket.org/vincentfu/fio-steadystate into steady-state-2