Merge pull request #1851 from dneelyep:patch-1
Merge pull request #2313 from m3d:patch-1
Merge pull request #2311 from SvenWe:master
added performance tests for NLMeans
Updated DisplayImage.cpp program to compile

CV_WINDOW_AUTOSIZE -> WINDOW_AUTOSIZE
removed return images and fixed cv2 names
added 3-channel support to arithmetic operations
undo changes of cv2.cv.* functions/constants
Merge pull request #2317 from blueskymonster:master
Merge pull request #2322 from berak:b_cc_read
fixed bug reported by Irina K. Also tried to fix LBP detector regression in quality (probably it did not help but still ...)
3-channel support in OpenCL kernels for setTo, resize, warpAffine and warpPerspective
tab => spaces
bugfix: blobdetector was putting incorrect diameter value in keypoints
Some tests for UMat
added imgpoints back
Merge pull request #2324 from vpisarev:fix_facedetect
Merge pull request #2319 from m3d:patch-1
-j8 in linux_installation tutorial
Merge pull request #2304 from mattvenn:master