Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2018-12-18' into staging