Merge branch 'fio-jsonplus-patches' of https://github.com/vincentkfu/fio