Merge commit '05b9c991dd' into merge-2.4

Conflicts:
	modules/cuda/test/test_objdetect.cpp
	modules/gpu/perf/perf_core.cpp
	modules/gpu/perf/perf_video.cpp
	modules/gpu/test/test_core.cpp

modules/cudaoptflow/perf/perf_optflow.cpp

@@ -444,7 +444,7 @@ PERF_TEST_P(ImagePair, OpticalFlowBM,
     }
 }
 
-PERF_TEST_P(ImagePair, FastOpticalFlowBM,
+PERF_TEST_P(ImagePair, DISABLED_FastOpticalFlowBM,
             Values<pair_string>(make_pair("gpu/opticalflow/frame0.png", "gpu/opticalflow/frame1.png")))
 {
     declare.time(400);