Merge pull request #10938 from mshabunin:fix-static-issues-9
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 2 Mar 2018 11:34:52 +0000 (11:34 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 2 Mar 2018 11:34:53 +0000 (11:34 +0000)

Trivial merge