Merge pull request #3323 from rubenk/cuda-fix-build