Merge pull request #15938 from alalek:backport_15290
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 18 Nov 2019 18:26:00 +0000 (18:26 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 18 Nov 2019 18:26:00 +0000 (18:26 +0000)

Trivial merge