Merge pull request #9134 from mshabunin:fix-static-6
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 10 Jul 2017 20:49:36 +0000 (20:49 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 10 Jul 2017 20:49:36 +0000 (20:49 +0000)

Trivial merge