Merge pull request #2181 from asmorkalov:ocv_packaging