Merge remote-tracking branch 'qemu-project/master'