Merge branch 'master' of https://github.com/bvanassche/fio

* 'master' of https://github.com/bvanassche/fio:
  client: Make skipping option appending in handle_job_opt() more selective
  client: Fix two memory leaks in handle_job_opt()
  Make json_object_add_value_string() duplicate its 'value' argument

diff --cc client.c
Simple merge