Merge pull request #15309 from alalek:backport_15305
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 15 Aug 2019 12:02:24 +0000 (12:02 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 15 Aug 2019 12:02:24 +0000 (12:02 +0000)

Trivial merge