Merge pull request #10418 from mypopydev:master
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 26 Dec 2017 14:21:59 +0000 (14:21 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 26 Dec 2017 14:21:59 +0000 (14:21 +0000)

Trivial merge