Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2018-07-03' into staging