Merge pull request #17744 from alalek:issue_17657
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 3 Jul 2020 21:21:27 +0000 (21:21 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 3 Jul 2020 21:21:27 +0000 (21:21 +0000)

Trivial merge