Merge remote-tracking branch 'upstream/3.4' into merge-3.4

diff --cc CMakeLists.txt
Simple merge

diff --cc cmake/OpenCVUtils.cmake
Simple merge

diff --cc doc/Doxyfile.in
index c8d127b,50f4926..3127733
--- 1/doc/Doxyfile.in
--- 2/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@@ -104,10 -104,10 +104,10 @@@ INPUT                  = @CMAKE_DOXYGEN
  INPUT_ENCODING         = UTF-8
  FILE_PATTERNS          =
  RECURSIVE              = YES
 -EXCLUDE                =
 +EXCLUDE                = @CMAKE_DOXYGEN_EXCLUDE_LIST@
  EXCLUDE_SYMLINKS       = NO
  EXCLUDE_PATTERNS       = *.inl.hpp *.impl.hpp *_detail.hpp */cudev/**/detail/*.hpp *.m */opencl/runtime/*
- EXCLUDE_SYMBOLS        = cv::DataType<*> cv::traits::* int void CV__*
+ EXCLUDE_SYMBOLS        = cv::DataType<*> cv::traits::* int void CV__* T __CV*
  EXAMPLE_PATH           = @CMAKE_DOXYGEN_EXAMPLE_PATH@
  EXAMPLE_PATTERNS       = *
  EXAMPLE_RECURSIVE      = YES

diff --cc modules/calib3d/src/circlesgrid.cpp
Simple merge

diff --cc modules/calib3d/src/circlesgrid.hpp
Simple merge

diff --cc modules/calib3d/test/test_chesscorners.cpp
Simple merge

diff --cc modules/core/include/opencv2/core.hpp
Simple merge

diff --cc modules/core/include/opencv2/core/base.hpp
Simple merge

diff --cc modules/core/include/opencv2/core/utility.hpp
Simple merge

diff --cc modules/highgui/src/window_w32.cpp
Simple merge

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