Merge branch 'fio-c++-engine' of https://github.com/tchaikov/fio