Merge branch 'terse_units' of https://github.com/sitsofe/fio