Header fix
Merge branch 'masterupstream' into cudaupstream