Merge branch 'master' into gpu-cuda-rename

Conflicts:
	modules/core/include/opencv2/core/cuda.hpp
	modules/cudacodec/src/thread.cpp
	modules/cudacodec/src/thread.hpp
	modules/superres/perf/perf_superres.cpp
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/optical_flow.cpp
	modules/videostab/src/global_motion.cpp
	modules/videostab/src/inpainting.cpp
	samples/cpp/stitching_detailed.cpp
	samples/cpp/videostab.cpp
	samples/gpu/stereo_multi.cpp

modules/cudawarping/src/pyramids.cpp

@@ -237,7 +237,7 @@ Ptr<ImagePyramid> cv::cuda::createImagePyramid(InputArray img, int nLayers, Stre
     throw_no_cuda();
     return Ptr<ImagePyramid>();
 #else
-    return new ImagePyramidImpl(img, nLayers, stream);
+    return Ptr<ImagePyramid>(new ImagePyramidImpl(img, nLayers, stream));
 #endif
 }