Merge branch 'master' of https://github.com/MicheleCancilla/opencv into parallel_ccomp

diff --cc modules/imgproc/include/opencv2/imgproc.hpp
Simple merge

diff --cc modules/video/src/bgfg_KNN.cpp
Simple merge

diff --cc modules/video/src/bgfg_gaussmix2.cpp
Simple merge