Merge pull request #1943 from pentschev:ocl_oclMat_ptr_remove_2.4