Merge branch 'master' of git.qemu.org:/pub/git/qemu