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

diff --cc doc/Doxyfile.in
index ce7a91d,c881964..ec7d7cd
--- 1/doc/Doxyfile.in
--- 2/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@@ -242,11 -240,8 +242,11 @@@ PREDEFINED             = __cplusplus=1 
                           CV_PROP_RW= \
                           CV_WRAP= \
                           CV_WRAP_AS(x)= \
 +                         CV_WRAP_MAPPABLE(x)= \
 +                         CV_WRAP_PHANTOM(x)= \
 +                         CV_WRAP_DEFAULT(x)= \
                           CV_CDECL= \
-                          CV_Func = \
+                          CV_Func= \
                           CV_DO_PRAGMA(x)= \
                           CV_SUPPRESS_DEPRECATED_START= \
                           CV_SUPPRESS_DEPRECATED_END= \

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

diff --cc modules/dnn/src/dnn.cpp
Simple merge