Merge pull request #8776 from sovrasov:inpaint_adv_formats
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 24 May 2017 12:17:45 +0000 (12:17 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 24 May 2017 12:17:45 +0000 (12:17 +0000)

Trivial merge