Merge remote-tracking branch 'qemu/master'