Merge pull request #3332 from rubenk/cuda-3320