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