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

Conflicts:
	modules/ocl/src/arithm.cpp

diff --cc modules/ocl/src/arithm.cpp
index 9b060e4,7784560..08f9dfc
--- 1/modules/ocl/src/arithm.cpp
--- 2/modules/ocl/src/arithm.cpp
+++ b/modules/ocl/src/arithm.cpp
@@@ -658,8 -634,7 +658,8 @@@ static void arithm_absdiff_nonsaturate_
          args.push_back( std::make_pair( sizeof(cl_int), (void *)&src2step1 ));
          args.push_back( std::make_pair( sizeof(cl_int), (void *)&src2offset1 ));
  
-         kernelName = kernelName + "_binary";
-         buildOptions = buildOptions + " -D BINARY";
+         kernelName += "_binary";
++        buildOptions += " -D BINARY";
      }
  
      args.push_back( std::make_pair( sizeof(cl_mem), (void *)&diff.data ));

diff --cc modules/ocl/src/imgproc.cpp
Simple merge