Merge remote-tracking branch 'remotes/awilliam/tags/vfio-updates-20161031.0' into...