Merge pull request #15868 from alalek:issue_15857
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 7 Nov 2019 14:21:35 +0000 (14:21 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 7 Nov 2019 14:21:35 +0000 (14:21 +0000)

Trivial merge