Merge branch 'kvm-bugfixes' into HEAD