Merge pull request #15540 from alalek:issue_15278_2
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 18 Sep 2019 20:12:36 +0000 (20:12 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 18 Sep 2019 20:12:36 +0000 (20:12 +0000)

Trivial merge