Merged in benoitsteiner/opencl (pull request PR-246)

Improved support for OpenCL