Merge pull request #2483 from ilya-lavrenov:tapi_3_vs_4
Merge pull request #2481 from akarsakov:fix_hog_intel
ocl: compare with scalar
ocl: fixes
ocl: workaround for Pow accuracy test failure
missing () on Mat::type()
Viz::setViewerPose() - changed up-vector to down (common for Computer Vision & Odometry)
finalizing
Merge pull request #2484 from berak:mat_doc_24
Merge pull request #2485 from Nerei:viz_correct_viewer_pose
ocl: compare: remove useless perf tests
Merge pull request #2428 from alalek:ocl_copyMakeBorder_3channels
fixed  h / s ranges in histogram_calculation tutorial

literalinclude

literalinclude, dropped :lines:
Merge pull request #2479 from alalek:ocl_compare_scalar
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
	modules/imgproc/src/opencl/precornerdetect.cl
	modules/nonfree/perf/perf_main.cpp
	modules/nonfree/perf/perf_surf.ocl.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/opencl/arithm_bitwise.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
	modules/ocl/src/opencl/arithm_minMax.cl
	modules/ocl/src/opencl/arithm_nonzero.cl
	modules/ocl/src/opencl/arithm_sum.cl
	modules/ocl/test/test_arithm.cpp
	modules/viz/src/precomp.hpp
	modules/viz/src/vizcore.cpp
	modules/viz/src/vtk/vtkCloudMatSink.h
	modules/viz/src/vtk/vtkXYZReader.cpp
	modules/viz/src/vtk/vtkXYZReader.h
	modules/viz/test/test_precomp.hpp
OpenCV_MODULES_SUFFIX variable added to OpenCVConfig.cmake to enable custom module configurations.
Merge pull request #2458 from asmorkalov:android_cmake_opencv_modules_suffix
Merge pull request #2460 from berak:b_3598_24
Fix problems on Intel HD graphics
minor doc fix