Merge pull request #1608 from alalek:fix_warn_upd_haar
Merge pull request #1610 from alalek:ocl_fix_perf_kalman
Merge pull request #1611 from che-burashco:master
ocl: fix for get string info from OpenCL
perf: added simple collection strategy
ocl::cvtColor works with ROI properly
some optimization of binary ocl::bitwise operations
misprint in disabling ocl::svm
Merge pull request #1450 from adrians:neon-pull3
Merge pull request #1616 from ilya-lavrenov:ocl_cvtColor
Merge pull request #1609 from ilya-lavrenov:ocl_some_optimization
Merge pull request #1612 from alalek:ocl_fix_string_info
Merge pull request #1614 from ilya-lavrenov:ocl_svm_misprint
demonstrative device info output
Fixed typo in document.

Signed-off-by: Han Qiang <a0byte@gmail.com>
Merge pull request #1617 from ilya-lavrenov:ocl_info
Merge pull request #1573 from alalek:perf_simple_strategy
Added -l prefix to EXTRA_COMPONENTS when generating pkg-config file
Merge pull request #1622 from a0byte:2.4
Record OpenCV build type among the test properties.

Because apparently I love running performance tests for debug builds.