Merge pull request #11605 from alalek:fix_build_10963
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 28 May 2018 18:18:40 +0000 (18:18 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 28 May 2018 18:18:40 +0000 (18:18 +0000)

Trivial merge