Merge branch 'kvm-ppc-fix' into HEAD