opencv_candidate 0.2.1
Merge pull request #3849 from vrabaud/master

opencv_candidate 0.2.1