Merge pull request #18551 from alalek:issue_17964
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 9 Oct 2020 16:08:12 +0000 (16:08 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 9 Oct 2020 16:08:12 +0000 (16:08 +0000)

Trivial merge