fix for #294
Merge branch 'master' into virtio