Merge pull request #16657 from alalek:issue_16655_master
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 26 Feb 2020 14:36:08 +0000 (14:36 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 26 Feb 2020 14:36:08 +0000 (14:36 +0000)

Trivial merge