Merge pull request #17635 from jsxyhelu:3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 10 Jul 2020 15:11:53 +0000 (15:11 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 10 Jul 2020 15:11:53 +0000 (15:11 +0000)

Trivial merge