Merge pull request #12994 from vpisarev:fix_imshow_mac
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 31 Oct 2018 11:13:28 +0000 (11:13 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 31 Oct 2018 11:13:28 +0000 (11:13 +0000)

Trivial merge