Merge pull request #15150 from alalek:fix_15124_15125
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 25 Jul 2019 18:19:04 +0000 (18:19 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 25 Jul 2019 18:19:04 +0000 (18:19 +0000)

Trivial merge