Merge branch 'kvm-master' into HEAD