renamed **2 -> **

Conflicts:

	modules/core/src/ocl.cpp