Merge pull request #3337 from jazzgs/feature_opencv