Merge branch 'wip-cxx' of https://github.com/tchaikov/fio