Merge pull request #3367 from akarsakov:ocl_image2d