Merge pull request #18554 from alalek:issue_17945
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 9 Oct 2020 19:54:17 +0000 (19:54 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 9 Oct 2020 19:54:17 +0000 (19:54 +0000)

Trivial merge