Merge pull request #10745 from terfendail:tiff_fix
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 20 Feb 2018 14:47:13 +0000 (14:47 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 20 Feb 2018 14:47:13 +0000 (14:47 +0000)

Trivial merge