Merge pull request #13467 from alalek:issue_12594
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 21 Dec 2018 11:01:25 +0000 (11:01 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 21 Dec 2018 11:01:25 +0000 (11:01 +0000)

Trivial merge