Merge branch 'libvirt-interfacenumber'