Merge remote branch 'qemu-kvm/uq/master' into staging