Merge branch 'master', remote branch 'origin'
fix issue with OpenCL on mac on CPU