Merge pull request #12374 from alalek:issue_12368
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 3 Sep 2018 10:17:09 +0000 (10:17 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 3 Sep 2018 10:17:09 +0000 (10:17 +0000)

Trivial merge