Merge pull request #10581 from mshabunin:minor-issues-fixes
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 16 Jan 2018 13:19:32 +0000 (13:19 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 16 Jan 2018 13:19:32 +0000 (13:19 +0000)

Trivial merge