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

diff --cc CMakeLists.txt
Simple merge

diff --cc cmake/templates/cvconfig.h.in
index f6171d7,c661a20..72472a6
--- 1/cmake/templates/cvconfig.h.in
--- 2/cmake/templates/cvconfig.h.in
+++ b/cmake/templates/cvconfig.h.in
@@@ -46,13 -46,16 +46,13 @@@
  /* Cocoa API */
  #cmakedefine HAVE_COCOA
  
- /* NVidia Cuda Basic Linear Algebra Subprograms (BLAS) API*/
 -/* C= */
 -#cmakedefine HAVE_CSTRIPES
 -
+ /* NVIDIA CUDA Basic Linear Algebra Subprograms (BLAS) API*/
  #cmakedefine HAVE_CUBLAS
  
- /* NVidia Cuda Runtime API*/
+ /* NVIDIA CUDA Runtime API*/
  #cmakedefine HAVE_CUDA
  
- /* NVidia Cuda Fast Fourier Transform (FFT) API*/
+ /* NVIDIA CUDA Fast Fourier Transform (FFT) API*/
  #cmakedefine HAVE_CUFFT
  
  /* IEEE1394 capturing support */

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

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

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

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