Merge pull request #13279 from mshabunin:fix-carotene-build-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 26 Nov 2018 09:30:31 +0000 (09:30 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 26 Nov 2018 09:30:32 +0000 (09:30 +0000)

Trivial merge