Merge pull request #12222 from NCBee:master
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 16 Aug 2018 16:02:39 +0000 (16:02 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 16 Aug 2018 16:02:39 +0000 (16:02 +0000)

Trivial merge