Fix-OpenCL-help
Merge branch 'master' into 7mod