Merge pull request #9826 from p0wdrdotcom:master
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 11 Oct 2017 08:55:15 +0000 (08:55 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 11 Oct 2017 08:55:15 +0000 (08:55 +0000)

Trivial merge