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

diff --cc CMakeLists.txt
Simple merge

diff --cc cmake/OpenCVDetectInferenceEngine.cmake
Simple merge

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

diff --cc modules/core/src/system.cpp
Simple merge

diff --cc modules/dnn/src/op_inf_engine.hpp
Simple merge

diff --cc modules/dnn/test/test_backends.cpp
Simple merge

diff --cc modules/dnn/test/test_common.hpp
Simple merge

diff --cc modules/dnn/test/test_common.impl.hpp
Simple merge

diff --cc modules/objdetect/src/cascadedetect.cpp
index a1865e9,bd62cd2..b7ef04e
--- 1/modules/objdetect/src/cascadedetect.cpp
--- 2/modules/objdetect/src/cascadedetect.cpp
+++ b/modules/objdetect/src/cascadedetect.cpp
@@@ -44,8 -44,13 +44,12 @@@
  #include <iostream>
  
  #include "cascadedetect.hpp"
 -#include "opencv2/objdetect/objdetect_c.h"
  #include "opencl_kernels_objdetect.hpp"
  
+ #if defined(_MSC_VER)
+ #  pragma warning(disable:4458)  // declaration of 'origWinSize' hides class member
+ #endif
+ 
  namespace cv
  {
  

diff --cc modules/objdetect/src/cascadedetect.hpp
Simple merge

diff --cc samples/cpp/CMakeLists.txt
Simple merge

diff --cc samples/dnn/js_face_recognition.html
index 3cfb122,27da6b5..48e6731
--- 1/samples/dnn/js_face_recognition.html
--- 2/samples/dnn/js_face_recognition.html
+++ b/samples/dnn/js_face_recognition.html
@@@ -69,7 -69,7 +69,7 @@@ function recognize(face) 
  
  function loadModels(callback) {
    var utils = new Utils('');
-   var proto = 'https://raw.githubusercontent.com/opencv/opencv/master/samples/dnn/face_detector/deploy.prototxt';
 -  var proto = 'https://raw.githubusercontent.com/opencv/opencv/3.4/samples/dnn/face_detector/deploy_lowres.prototxt';
++  var proto = 'https://raw.githubusercontent.com/opencv/opencv/master/samples/dnn/face_detector/deploy_lowres.prototxt';
    var weights = 'https://raw.githubusercontent.com/opencv/opencv_3rdparty/dnn_samples_face_detector_20180205_fp16/res10_300x300_ssd_iter_140000_fp16.caffemodel';
    var recognModel = 'https://raw.githubusercontent.com/pyannote/pyannote-data/master/openface.nn4.small2.v1.t7';
    utils.createFileFromUrl('face_detector.prototxt', proto, () => {