Merge pull request #15581 from takacsd:3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 25 Sep 2019 10:45:49 +0000 (10:45 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 25 Sep 2019 10:45:49 +0000 (10:45 +0000)

Trivial merge