Fix #216 #237
Merge branch 'master' into virtio