Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2020-09-29' into staging