Merge pull request #8062 from mshabunin:add-cv_deprecated
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 25 Jan 2017 15:04:42 +0000 (15:04 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 25 Jan 2017 15:04:42 +0000 (15:04 +0000)

Trivial merge