Merge branch 'testing' of github.com:MartinHell/pyvirt into testing