Merge pull request #9879 from alalek:fix_build
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Wed, 18 Oct 2017 14:49:44 +0000 (14:49 +0000)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Wed, 18 Oct 2017 14:49:44 +0000 (14:49 +0000)

Trivial merge