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

Improved support for OpenCL