fixup regression in nvidia's driver 340.xx series
Merge branch 'master' into blkload