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