Merge pull request #12047 from alalek:issue_12045
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 24 Jul 2018 19:44:25 +0000 (19:44 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 24 Jul 2018 19:44:25 +0000 (19:44 +0000)

Trivial merge