Merge remote-tracking branch 'origin/master' into merge-2.4

Conflicts:
	modules/ocl/src/arithm.cpp
Fixed build errors.