Merge pull request #16372 from alalek:backport_16350
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 18 Jan 2020 17:57:46 +0000 (17:57 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 18 Jan 2020 17:57:46 +0000 (17:57 +0000)

Trivial merge