Merge pull request #15747 from TH3CHARLie:imshow-fix
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sun, 20 Oct 2019 13:08:40 +0000 (13:08 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sun, 20 Oct 2019 13:08:40 +0000 (13:08 +0000)

Trivial merge