Merge pull request #9449 from ribalda:ocv
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 23 Aug 2017 19:40:36 +0000 (19:40 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 23 Aug 2017 19:40:36 +0000 (19:40 +0000)

Trivial merge