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