Fixed some bad stencils
Merge remote branch 'origin/feature/opencl' into feature/opencl