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/cudacodec/src/thread.cpp

@@ -167,9 +167,4 @@ void cv::cudacodec::detail::Thread::sleep(int ms)
 #endif
 }
 
-template <> void cv::Ptr<cv::cudacodec::detail::Thread::Impl>::delete_obj()
-{
-    if (obj) delete obj;
-}
-
 #endif // HAVE_NVCUVID

modules/cudacodec/src/thread.hpp

@@ -67,8 +67,4 @@ private:
 
 }}}
 
-namespace cv {
-    template <> void Ptr<cv::cudacodec::detail::Thread::Impl>::delete_obj();
-}
-
 #endif // __THREAD_WRAPPERS_HPP__