Merge remote-tracking branch 'pci-bjorn/topic/alex-vfio-prep' into groups