Merge commit 'kvm-pagedata-alloc-fixes' into HEAD