Merge pull request #11567 from alalek:code_quality
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 23 May 2018 15:47:11 +0000 (15:47 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 23 May 2018 15:47:11 +0000 (15:47 +0000)

Trivial merge