Merge remote-tracking branch 'upstream/master'

diff --cc CMakeLists.txt
index ba0f27bfa7e292bfae55e449adbfeacec4ec1133,442edf32c39b9b7104b9c3d65e9737ce742f75fd..ec5086c1e3ccdd1c2191d72d705b781d564e7604
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -118,9 -125,8 +125,9 @@@ OCV_OPTION(WITH_EIGEN          "Includ
  OCV_OPTION(WITH_VFW            "Include Video for Windows support"           ON   IF WIN32 )
  OCV_OPTION(WITH_FFMPEG         "Include FFMPEG support"                      ON   IF (NOT ANDROID AND NOT IOS))
  OCV_OPTION(WITH_GSTREAMER      "Include Gstreamer support"                   ON   IF (UNIX AND NOT APPLE AND NOT ANDROID) )
- OCV_OPTION(WITH_GSTREAMER_1_X  "Include Gstreamer 1.x support"               OFF)
+ OCV_OPTION(WITH_GSTREAMER_0_10 "Enable Gstreamer 0.10 support (instead of 1.x)"                              OFF )
  OCV_OPTION(WITH_GTK            "Include GTK support"                         ON   IF (UNIX AND NOT APPLE AND NOT ANDROID) )
 +OCV_OPTION(WITH_GTK_2_X        "Use GTK version 2"                           OFF  IF (UNIX AND NOT APPLE AND NOT ANDROID) )
  OCV_OPTION(WITH_IPP            "Include Intel IPP support"                   OFF  IF (MSVC OR X86 OR X86_64) )
  OCV_OPTION(WITH_JASPER         "Include JPEG2K support"                      ON   IF (NOT IOS) )
  OCV_OPTION(WITH_JPEG           "Include JPEG support"                        ON)

diff --cc cmake/OpenCVMinDepVersions.cmake
index b70a60cf6bb5197f0861f8ced4b95f1cc6216bb5,a9bede40248fdea8b68fc79d79c08b37aa2a6f9b..9dae725481b1be2613040c1b269d8c1a682f943e
--- 1/cmake/OpenCVMinDepVersions.cmake
--- 2/cmake/OpenCVMinDepVersions.cmake
+++ b/cmake/OpenCVMinDepVersions.cmake
@@@ -1,4 -1,4 +1,5 @@@
  set(MIN_VER_CMAKE 2.8.7)
+ set(MIN_VER_CUDA 4.2)
  set(MIN_VER_PYTHON 2.6)
  set(MIN_VER_ZLIB 1.2.3)
 +set(MIN_VER_GTK 2.18.0)

diff --cc cmake/templates/cvconfig.h.in
Simple merge

diff --cc modules/highgui/CMakeLists.txt
Simple merge

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