Merge pull request #11381 from alalek:replace_cv_errornoreturn
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 24 Apr 2018 15:06:59 +0000 (15:06 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 24 Apr 2018 15:06:59 +0000 (15:06 +0000)

Trivial merge