Merge branch 'kvm-older-features' into HEAD