Fix "OpenCL" Configure and help
Merge branch 'master' into 7mod