Merge remote-tracking branch 'remotes/awilliam/tags/vfio-fixes-20150723.0' into staging