Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
	modules/imgproc/src/opencl/integral_sqrsum.cl
	modules/nonfree/doc/feature_detection.rst
	modules/nonfree/include/opencv2/nonfree/ocl.hpp
	modules/nonfree/src/surf_ocl.cpp
	modules/nonfree/test/test_features2d.cpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/match_template.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/src/opencl/haarobjectdetect_scaled2.cl
	modules/ocl/test/test_imgproc.cpp

diff --cc cmake/templates/OpenCVConfig.cmake.in
Simple merge

diff --cc doc/conf.py
Simple merge

diff --cc doc/tutorials/introduction/load_save_image/load_save_image.rst
Simple merge

diff --cc modules/core/doc/old_basic_structures.rst
Simple merge

diff --cc modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
Simple merge

diff --cc modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
Simple merge

diff --cc modules/highgui/src/cap_avfoundation.mm
Simple merge

diff --cc modules/nonfree/perf/perf_surf.cpp
index d912977,85b2339..09de523
--- 1/modules/nonfree/perf/perf_surf.cpp
--- 2/modules/nonfree/perf/perf_surf.cpp
+++ b/modules/nonfree/perf/perf_surf.cpp
@@@ -14,11 -14,9 +14,9 @@@ typedef perf::TestBaseWithParam<std::st
  
  PERF_TEST_P(surf, detect, testing::Values(SURF_IMAGES))
  {
 -    String filename = getDataPath(GetParam());
 +    string filename = getDataPath(GetParam());
      Mat frame = imread(filename, IMREAD_GRAYSCALE);
- 
-     if (frame.empty())
-         FAIL() << "Unable to load source image " << filename;
+     ASSERT_FALSE(frame.empty()) << "Unable to load source image " << filename;
  
      Mat mask;
      declare.in(frame).time(90);
@@@ -32,11 -30,9 +30,9 @@@
  
  PERF_TEST_P(surf, extract, testing::Values(SURF_IMAGES))
  {
 -    String filename = getDataPath(GetParam());
 +    string filename = getDataPath(GetParam());
      Mat frame = imread(filename, IMREAD_GRAYSCALE);
- 
-     if (frame.empty())
-         FAIL() << "Unable to load source image " << filename;
+     ASSERT_FALSE(frame.empty()) << "Unable to load source image " << filename;
  
      Mat mask;
      declare.in(frame).time(90);
@@@ -53,11 -49,9 +49,9 @@@
  
  PERF_TEST_P(surf, full, testing::Values(SURF_IMAGES))
  {
 -    String filename = getDataPath(GetParam());
 +    string filename = getDataPath(GetParam());
      Mat frame = imread(filename, IMREAD_GRAYSCALE);
- 
-     if (frame.empty())
-         FAIL() << "Unable to load source image " << filename;
+     ASSERT_FALSE(frame.empty()) << "Unable to load source image " << filename;
  
      Mat mask;
      declare.in(frame).time(90);

diff --cc samples/python2/asift.py
index e522fa7,104cc5c..2532086
--- 1/samples/python2/asift.py
--- 2/samples/python2/asift.py
+++ b/samples/python2/asift.py
@@@ -11,12 -11,12 +11,12 @@@ is used to reject outliers. Threading i
  [1] http://www.ipol.im/pub/algo/my_affine_sift/
  
  USAGE
 -  asift.py [--feature=<sift|surf|orb>[-flann]] [ <image1> <image2> ]
 +  asift.py [--feature=<sift|surf|orb|brisk>[-flann]] [ <image1> <image2> ]
  
 -  --feature  - Feature to use. Can be sift, surf of orb. Append '-flann' to feature name
 -                to use Flann-based matcher instead bruteforce.
 +  --feature  - Feature to use. Can be sift, surf, orb or brisk. Append '-flann'
 +               to feature name to use Flann-based matcher instead bruteforce.
  
-   Press left mouse button on a feature point to see its mathcing point.
+   Press left mouse button on a feature point to see its matching point.
  '''
  
  import numpy as np