Merge pull request #7069 from StevenPuttemans:try_fix_cuda
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Thu, 11 Aug 2016 11:06:34 +0000 (11:06 +0000)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Thu, 11 Aug 2016 11:06:34 +0000 (11:06 +0000)

Trivial merge