Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2021-01-28' into staging