Merge pull request #16520 from GArik:3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 10 Feb 2020 16:25:30 +0000 (16:25 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 10 Feb 2020 16:25:30 +0000 (16:25 +0000)

Trivial merge