Merge remote-tracking branch 'bonzini/tags/for-upstream' into staging