Merge remote branch 'qemu-kvm/uq/stable-0.12' into stable-0.12