Merge pull request #1995 from akarsakov:ocl_pyramids