Merge pull request #16919 from alalek:backport_16860
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 27 Mar 2020 16:44:05 +0000 (16:44 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 27 Mar 2020 16:44:05 +0000 (16:44 +0000)

Trivial merge