Merge pull request #16723 from jansol:master
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 5 Mar 2020 12:25:20 +0000 (12:25 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 5 Mar 2020 12:25:20 +0000 (12:25 +0000)

Trivial merge