Merge pull request #17010 from alalek:issue_16896
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 8 Apr 2020 14:50:00 +0000 (14:50 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 8 Apr 2020 14:50:00 +0000 (14:50 +0000)

Trivial merge