Merge pull request #13441 from paroj:capimg
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 14 Dec 2018 15:41:40 +0000 (15:41 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 14 Dec 2018 15:41:40 +0000 (15:41 +0000)

Trivial merge