Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20160526.1' into...