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

diff --cc modules/core/doc/clustering.rst
index dc9b287,49fd1e2..fd40475
--- 1/modules/core/doc/clustering.rst
--- 2/modules/core/doc/clustering.rst
+++ b/modules/core/doc/clustering.rst
@@@ -13,9 -13,19 +13,17 @@@ Finds centers of clusters and groups in
  
  .. ocv:cfunction:: int cvKMeans2( const CvArr* samples, int cluster_count, CvArr* labels, CvTermCriteria termcrit, int attempts=1, CvRNG* rng=0, int flags=0, CvArr* _centers=0, double* compactness=0 )
  
 -.. ocv:pyoldfunction:: cv.KMeans2(samples, nclusters, labels, termcrit, attempts=1, flags=0, centers=None) -> float
 -
      :param samples: Floating-point matrix of input samples, one row per sample.
  
-     :param data: Data for clustering.
+     :param data: Data for clustering. An array of N-Dimensional points with float coordinates is needed. Examples of this array can be:
+ 
+            * ``Mat points(count, 2, CV_32F);``
+ 
+            * ``Mat points(count, 1, CV_32FC2);``
+ 
+            * ``Mat points(1, count, CV_32FC2);``
+ 
+            * ``std::vector<cv::Point2f> points(sampleCount);``
  
      :param cluster_count: Number of clusters to split the set by.
  

diff --cc modules/legacy/src/calibfilter.cpp
Simple merge