Merge pull request #7210 from mshabunin:fix-warnings
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 2 Sep 2016 12:50:45 +0000 (12:50 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 2 Sep 2016 12:50:45 +0000 (12:50 +0000)

Trivial merge