Merge pull request #11489 from alalek:fix_arm_build
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 10 May 2018 14:37:51 +0000 (14:37 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 10 May 2018 14:37:51 +0000 (14:37 +0000)

Trivial merge