Merge pull request #8060 from Legoless:master
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 25 Jan 2017 11:32:24 +0000 (11:32 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 25 Jan 2017 11:32:24 +0000 (11:32 +0000)

Trivial merge