Merge pull request #12846 from alalek:issue_12834
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 15 Oct 2018 19:19:46 +0000 (19:19 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 15 Oct 2018 19:19:46 +0000 (19:19 +0000)

Trivial merge