Merge commit '43aec5ad' into merge-2.4

Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py

samples/python2/opt_flow.py

@@ -85,4 +85,3 @@ if __name__ == '__main__':
                 cur_glitch = img.copy()
             print 'glitch is', ['off', 'on'][show_glitch]
     cv2.destroyAllWindows()
-