Merge pull request #7066 from StevenPuttemans:fix_build_cuda_issues
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Mon, 8 Aug 2016 13:22:49 +0000 (13:22 +0000)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Mon, 8 Aug 2016 13:22:49 +0000 (13:22 +0000)

Trivial merge