opencv: bool -> int for config params
Merge remote branch 'origin/master'