Merge remote-tracking branch 'bonzini/nested-makefiles-3' into staging