Merge with master of Avi's kvm.git